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

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 7a6618eb..df401b5a 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -1,25 +1,19 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1994-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* system.c                                                 *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// system.c
+// ============================================================================
 
 #include <string.h>
 #include <signal.h>
 
 #include "platform.h"
 
-#if defined(PLATFORM_MSDOS)
-#include <fcntl.h>
-#endif
-
 #include "system.h"
 #include "image.h"
 #include "sound.h"
@@ -27,6 +21,8 @@
 #include "joystick.h"
 #include "misc.h"
 
+#define ENABLE_UNUSED_CODE	0	/* currently unused functions */
+
 
 /* ========================================================================= */
 /* exported variables                                                        */
@@ -46,10 +42,7 @@ LevelDirTree	       *leveldir_first = NULL;
 LevelDirTree	       *leveldir_current = NULL;
 int			level_nr;
 
-Display		       *display = NULL;
-Visual		       *visual = NULL;
-int			screen = 0;
-Colormap		cmap = None;
+struct LevelStats	level_stats[MAX_LEVELS];
 
 DrawWindow	       *window = NULL;
 DrawBuffer	       *backbuffer = NULL;
@@ -57,9 +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;
 
@@ -68,39 +64,54 @@ int			FrameCounter = 0;
 /* init/close functions                                                      */
 /* ========================================================================= */
 
-void InitProgramInfo(char *argv0,
-		     char *userdata_subdir, char *userdata_subdir_unix,
-		     char *program_title, char *window_title, char *icon_title,
-		     char *x11_icon_filename, char *x11_iconmask_filename,
-		     char *sdl_icon_filename, char *msdos_cursor_filename,
-		     char *cookie_prefix, char *filename_prefix,
+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)
 {
   program.command_basepath = getBasePath(argv0);
   program.command_basename = getBaseName(argv0);
 
+  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;
-  program.window_title = window_title;
+  program.window_title = "(undefined)";
   program.icon_title = icon_title;
 
-  program.x11_icon_filename = x11_icon_filename;
-  program.x11_iconmask_filename = x11_iconmask_filename;
-  program.sdl_icon_filename = sdl_icon_filename;
-  program.msdos_cursor_filename = msdos_cursor_filename;
+  program.icon_filename = icon_filename;
 
   program.cookie_prefix = cookie_prefix;
-  program.filename_prefix = filename_prefix;
 
   program.version_major = VERSION_MAJOR(program_version);
   program.version_minor = VERSION_MINOR(program_version);
   program.version_patch = VERSION_PATCH(program_version);
+  program.version_build = VERSION_BUILD(program_version);
+  program.version_ident = program_version;
+
+  program.log_filename[LOG_OUT_ID] = getLogFilename(LOG_OUT_BASENAME);
+  program.log_filename[LOG_ERR_ID] = getLogFilename(LOG_ERR_BASENAME);
+  program.log_file[LOG_OUT_ID] = program.log_file_default[LOG_OUT_ID] = stdout;
+  program.log_file[LOG_ERR_ID] = program.log_file_default[LOG_ERR_ID] = stderr;
+}
 
-  program.error_filename = getErrorFilename(ERROR_BASENAME);
-  program.error_file = stderr;
+void SetWindowTitle()
+{
+  program.window_title = program.window_title_function();
+
+  SDLSetWindowTitle();
+}
+
+void InitWindowTitleFunction(char *(*window_title_function)(void))
+{
+  program.window_title_function = window_title_function;
+}
+
+void InitExitMessageFunction(void (*exit_message_function)(char *, va_list))
+{
+  program.exit_message_function = exit_message_function;
 }
 
 void InitExitFunction(void (*exit_function)(int))
@@ -108,46 +119,35 @@ 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);
 
-#if defined(TARGET_SDL)
   /* set exit function to automatically cleanup SDL stuff after exit() */
   atexit(SDL_Quit);
-#endif
 }
 
 void InitPlatformDependentStuff(void)
 {
-#if defined(PLATFORM_MSDOS)
-  _fmode = O_BINARY;
-#endif
+  // this is initialized in GetOptions(), but may already be used before
+  options.verbose = TRUE;
 
-#if defined(PLATFORM_MACOSX)
-  updateUserGameDataDir();
-#endif
+  OpenLogFiles();
 
-#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX)
-  openErrorFile();
+#if defined(TARGET_SDL2)
+  int sdl_init_flags = SDL_INIT_EVENTS      | SDL_INIT_NOPARACHUTE;
+#else
+  int sdl_init_flags = SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE;
 #endif
 
-#if defined(TARGET_SDL)
-  if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
+  if (SDL_Init(sdl_init_flags) < 0)
     Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
 
   SDLNet_Init();
-#endif
 }
 
 void ClosePlatformDependentStuff(void)
 {
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
-  closeErrorFile();
-#endif
-
-#if defined(PLATFORM_MSDOS)
-  dumpErrorFile();
-#endif
+  CloseLogFiles();
 }
 
 void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
@@ -166,13 +166,16 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
 
   gfx.field_save_buffer = field_save_buffer;
 
-  gfx.background_bitmap = NULL;
-  gfx.background_bitmap_mask = REDRAW_NONE;
-
   SetDrawDeactivationMask(REDRAW_NONE);		/* do not deactivate drawing */
   SetDrawBackgroundMask(REDRAW_NONE);		/* deactivate masked drawing */
 }
 
+void InitGfxTileSizeInfo(int game_tile_size, int standard_tile_size)
+{
+  gfx.game_tile_size = game_tile_size;
+  gfx.standard_tile_size = standard_tile_size;
+}
+
 void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize)
 {
   gfx.dx = dx;
@@ -189,18 +192,70 @@ void InitGfxDoor2Info(int vx, int vy, int vxsize, int vysize)
   gfx.vysize = vysize;
 }
 
+void InitGfxDoor3Info(int ex, int ey, int exsize, int eysize)
+{
+  gfx.ex = ex;
+  gfx.ey = ey;
+  gfx.exsize = exsize;
+  gfx.eysize = 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;
+}
+
 void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height)
 {
   /* currently only used by MSDOS code to alloc VRAM buffer, if available */
+  /* 2009-03-24: also (temporarily?) used for overlapping blit workaround */
   gfx.scrollbuffer_width = scrollbuffer_width;
   gfx.scrollbuffer_height = scrollbuffer_height;
 }
 
+void InitGfxClipRegion(boolean enabled, int x, int y, int width, int height)
+{
+  gfx.clipping_enabled = enabled;
+  gfx.clip_x = x;
+  gfx.clip_y = y;
+  gfx.clip_width = width;
+  gfx.clip_height = height;
+}
+
 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;
@@ -210,6 +265,11 @@ void InitGfxCustomArtworkInfo()
   gfx.draw_init_text = TRUE;
 }
 
+void InitGfxOtherSettings()
+{
+  gfx.cursor_mode = CURSOR_DEFAULT;
+}
+
 void SetDrawDeactivationMask(int draw_deactivation_mask)
 {
   gfx.draw_deactivation_mask = draw_deactivation_mask;
@@ -220,31 +280,6 @@ void SetDrawBackgroundMask(int draw_background_mask)
   gfx.draw_background_mask = draw_background_mask;
 }
 
-static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile,
-			       int dest_x, int dest_y, int width, int height)
-{
-  int bitmap_xsize = width;
-  int bitmap_ysize = height;
-  int tile_xsize = tile->width;
-  int tile_ysize = tile->height;
-  int tile_xsteps = (bitmap_xsize + tile_xsize - 1) / tile_xsize;
-  int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize;
-  int x, y;
-
-  for (y = 0; y < tile_ysteps; y++)
-  {
-    for (x = 0; x < tile_xsteps; x++)
-    {
-      int draw_x = dest_x + x * tile_xsize;
-      int draw_y = dest_y + y * tile_ysize;
-      int draw_xsize = MIN(tile_xsize, bitmap_xsize - x * tile_xsize);
-      int draw_ysize = MIN(tile_ysize, bitmap_ysize - y * tile_ysize);
-
-      BlitBitmap(tile, bitmap, 0, 0, draw_xsize, draw_ysize, draw_x, draw_y);
-    }
-  }
-}
-
 void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
 {
   if (background_bitmap_tile != NULL)
@@ -252,26 +287,18 @@ void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
   else
     gfx.background_bitmap_mask &= ~mask;
 
-  if (gfx.background_bitmap == NULL)
-    gfx.background_bitmap = CreateBitmap(video.width, video.height,
-					 DEFAULT_DEPTH);
-
   if (background_bitmap_tile == NULL)	/* empty background requested */
     return;
 
   if (mask == REDRAW_ALL)
-    DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
-		       0, 0, video.width, video.height);
+    BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0,
+		    0, 0, video.width, video.height);
   else if (mask == REDRAW_FIELD)
-    DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
-		       gfx.real_sx, gfx.real_sy,
-		       gfx.full_sxsize, gfx.full_sysize);
+    BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0,
+		    gfx.real_sx, gfx.real_sy, gfx.full_sxsize, gfx.full_sysize);
   else if (mask == REDRAW_DOOR_1)
-  {
-    DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
-		       gfx.dx, gfx.dy,
-		       gfx.dxsize, gfx.dysize);
-  }
+    BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0,
+		    gfx.dx, gfx.dy, gfx.dxsize, gfx.dysize);
 }
 
 void SetWindowBackgroundBitmap(Bitmap *background_bitmap_tile)
@@ -309,47 +336,40 @@ 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)
 {
-#if defined(TARGET_SDL)
   SDLFillRectangle(bitmap, x, y, width, height, color);
-#else
-  X11FillRectangle(bitmap, x, y, width, height, color);
-#endif
+
+  if (bitmap == backbuffer)
+    SetRedrawMaskFromArea(x, y, width, height);
 }
 
 inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 			       int src_x, int src_y, int width, int height,
 			       int dst_x, int dst_y, int mask_mode)
 {
-#if defined(TARGET_SDL)
   SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
 	      dst_x, dst_y, mask_mode);
-#else
-  X11CopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
-	      dst_x, dst_y, mask_mode);
-#endif
+
+  if (dst_bitmap == backbuffer)
+    SetRedrawMaskFromArea(dst_x, dst_y, width, height);
+}
+
+void LimitScreenUpdates(boolean enable)
+{
+  SDLLimitScreenUpdates(enable);
 }
 
 void InitVideoDisplay(void)
 {
-#if defined(TARGET_SDL)
   SDLInitVideoDisplay();
-#else
-  X11InitVideoDisplay();
-#endif
 }
 
 void CloseVideoDisplay(void)
 {
   KeyboardAutoRepeatOn();
 
-#if defined(TARGET_SDL)
   SDL_QuitSubSystem(SDL_INIT_VIDEO);
-#else
-  if (display)
-    XCloseDisplay(display);
-#endif
 }
 
 void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
@@ -360,44 +380,19 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
 
   video.fullscreen_available = FULLSCREEN_STATUS;
   video.fullscreen_enabled = FALSE;
-  video.fullscreen_modes = NULL;
-  video.fullscreen_mode_current = NULL;
 
-#if defined(TARGET_SDL)
-  SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
-#else
-  X11InitVideoBuffer(&backbuffer, &window);
-#endif
+  video.window_scaling_available = WINDOW_SCALING_STATUS;
 
-  drawto = backbuffer;
-}
-
-Bitmap *CreateBitmapStruct(void)
-{
-#if defined(TARGET_SDL)
-  return checked_calloc(sizeof(struct SDLSurfaceInfo));
-#else
-  return checked_calloc(sizeof(struct X11DrawableInfo));
-#endif
-}
+  video.frame_delay = 0;
+  video.frame_delay_value = GAME_FRAME_DELAY;
 
-Bitmap *CreateBitmap(int width, int height, int depth)
-{
-  Bitmap *new_bitmap = CreateBitmapStruct();
-  int real_width  = MAX(1, width);	/* prevent zero bitmap width */
-  int real_height = MAX(1, height);	/* prevent zero bitmap height */
-  int real_depth  = GetRealDepth(depth);
+  video.shifted_up = FALSE;
 
-#if defined(TARGET_SDL)
-  SDLCreateBitmapContent(new_bitmap, real_width, real_height, real_depth);
-#else
-  X11CreateBitmapContent(new_bitmap, real_width, real_height, real_depth);
-#endif
+  SDLInitVideoBuffer(fullscreen);
 
-  new_bitmap->width  = real_width;
-  new_bitmap->height = real_height;
+  video.initialized = TRUE;
 
-  return new_bitmap;
+  drawto = backbuffer;
 }
 
 inline static void FreeBitmapPointers(Bitmap *bitmap)
@@ -405,11 +400,7 @@ inline static void FreeBitmapPointers(Bitmap *bitmap)
   if (bitmap == NULL)
     return;
 
-#if defined(TARGET_SDL)
   SDLFreeBitmapPointers(bitmap);
-#else
-  X11FreeBitmapPointers(bitmap);
-#endif
 
   checked_free(bitmap->source_filename);
   bitmap->source_filename = NULL;
@@ -436,17 +427,65 @@ void FreeBitmap(Bitmap *bitmap)
   free(bitmap);
 }
 
-void CloseWindow(DrawWindow *window)
+Bitmap *CreateBitmapStruct(void)
+{
+  return checked_calloc(sizeof(Bitmap));
+}
+
+Bitmap *CreateBitmap(int width, int height, int depth)
+{
+  Bitmap *new_bitmap = CreateBitmapStruct();
+  int real_width  = MAX(1, width);	/* prevent zero bitmap width */
+  int real_height = MAX(1, height);	/* prevent zero bitmap height */
+  int real_depth  = GetRealDepth(depth);
+
+  SDLCreateBitmapContent(new_bitmap, real_width, real_height, real_depth);
+
+  new_bitmap->width  = real_width;
+  new_bitmap->height = real_height;
+
+  return new_bitmap;
+}
+
+void ReCreateBitmap(Bitmap **bitmap, int width, int height)
 {
-#if defined(TARGET_X11)
-  if (window->drawable)
+  Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH);
+
+  if (*bitmap == NULL)
   {
-    XUnmapWindow(display, window->drawable);
-    XDestroyWindow(display, window->drawable);
+    *bitmap = new_bitmap;
+  }
+  else
+  {
+    TransferBitmapPointers(new_bitmap, *bitmap);
+    free(new_bitmap);
   }
-  if (window->gc)
-    XFreeGC(display, window->gc);
-#endif
+}
+
+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,
@@ -458,16 +497,16 @@ inline static boolean CheckDrawingArea(int x, int y, int width, int height,
   if (draw_mask & REDRAW_ALL)
     return TRUE;
 
-  if ((draw_mask & REDRAW_FIELD) &&
-      x >= gfx.real_sx && x < gfx.real_sx + gfx.full_sxsize)
+  if ((draw_mask & REDRAW_FIELD) && IN_GFX_FIELD_FULL(x, y))
+    return TRUE;
+
+  if ((draw_mask & REDRAW_DOOR_1) && IN_GFX_DOOR_1(x, y))
     return TRUE;
 
-  if ((draw_mask & REDRAW_DOOR_1) &&
-      x >= gfx.dx && y < gfx.dy + gfx.dysize)
+  if ((draw_mask & REDRAW_DOOR_2) && IN_GFX_DOOR_2(x, y))
     return TRUE;
 
-  if ((draw_mask & REDRAW_DOOR_2) &&
-      x >= gfx.dx && y >= gfx.vy)
+  if ((draw_mask & REDRAW_DOOR_3) && IN_GFX_DOOR_3(x, y))
     return TRUE;
 
   return FALSE;
@@ -484,28 +523,170 @@ boolean DrawingOnBackground(int x, int y)
 	  CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
 }
 
+static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y,
+				  int *width, int *height, boolean is_dest)
+{
+  int clip_x, clip_y, clip_width, clip_height;
+
+  if (gfx.clipping_enabled && is_dest)	/* only clip destination bitmap */
+  {
+    clip_x = MIN(MAX(0, gfx.clip_x), bitmap->width);
+    clip_y = MIN(MAX(0, gfx.clip_y), bitmap->height);
+    clip_width = MIN(MAX(0, gfx.clip_width), bitmap->width - clip_x);
+    clip_height = MIN(MAX(0, gfx.clip_height), bitmap->height - clip_y);
+  }
+  else
+  {
+    clip_x = 0;
+    clip_y = 0;
+    clip_width = bitmap->width;
+    clip_height = bitmap->height;
+  }
+
+  /* skip if rectangle completely outside bitmap */
+
+  if (*x + *width  <= clip_x ||
+      *y + *height <= clip_y ||
+      *x >= clip_x + clip_width ||
+      *y >= clip_y + clip_height)
+    return FALSE;
+
+  /* clip if rectangle overlaps bitmap */
+
+  if (*x < clip_x)
+  {
+    *width -= clip_x - *x;
+    *x = clip_x;
+  }
+  else if (*x + *width > clip_x + clip_width)
+  {
+    *width = clip_x + clip_width - *x;
+  }
+
+  if (*y < clip_y)
+  {
+    *height -= clip_y - *y;
+    *y = clip_y;
+  }
+  else if (*y + *height > clip_y + clip_height)
+  {
+    *height = clip_y + clip_height - *y;
+  }
+
+  return TRUE;
+}
+
 void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 		int src_x, int src_y, int width, int height,
 		int dst_x, int dst_y)
 {
+  int dst_x_unclipped = dst_x;
+  int dst_y_unclipped = dst_y;
+
+  if (src_bitmap == NULL || dst_bitmap == NULL)
+    return;
+
   if (DrawingDeactivated(dst_x, dst_y, width, height))
     return;
 
-  sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
-	      dst_x, dst_y, BLIT_OPAQUE);
+  if (!InClippedRectangle(src_bitmap, &src_x, &src_y, &width, &height, FALSE) ||
+      !InClippedRectangle(dst_bitmap, &dst_x, &dst_y, &width, &height, TRUE))
+    return;
+
+  /* source x/y might need adjustment if destination x/y was clipped top/left */
+  src_x += dst_x - dst_x_unclipped;
+  src_y += dst_y - dst_y_unclipped;
+
+#if defined(TARGET_SDL2)
+  /* !!! 2013-12-11: An "old friend" is back. Same bug in SDL2 2.0.1 !!! */
+  /* !!! 2009-03-30: Fixed by using self-compiled, patched SDL.dll !!! */
+  /* (This bug still exists in the actual (as of 2009-06-15) version 1.2.13,
+     but is already fixed in SVN and should therefore finally be fixed with
+     the next official SDL release, which is probably version 1.2.14.) */
+  /* !!! 2009-03-24: It seems that this problem still exists in 1.2.12 !!! */
+
+  if (src_bitmap == dst_bitmap)
+  {
+    /* needed when blitting directly to same bitmap -- should not be needed with
+       recent SDL libraries, but apparently does not work in 1.2.11 directly */
+
+    static Bitmap *tmp_bitmap = NULL;
+    static int tmp_bitmap_xsize = 0;
+    static int tmp_bitmap_ysize = 0;
+
+    /* start with largest static bitmaps for initial bitmap size ... */
+    if (tmp_bitmap_xsize == 0 && tmp_bitmap_ysize == 0)
+    {
+      tmp_bitmap_xsize = MAX(gfx.win_xsize, gfx.scrollbuffer_width);
+      tmp_bitmap_ysize = MAX(gfx.win_ysize, gfx.scrollbuffer_height);
+    }
+
+    /* ... and allow for later re-adjustments due to custom artwork bitmaps */
+    if (src_bitmap->width > tmp_bitmap_xsize ||
+	src_bitmap->height > tmp_bitmap_ysize)
+    {
+      tmp_bitmap_xsize = MAX(tmp_bitmap_xsize, src_bitmap->width);
+      tmp_bitmap_ysize = MAX(tmp_bitmap_ysize, src_bitmap->height);
+
+      FreeBitmap(tmp_bitmap);
+
+      tmp_bitmap = NULL;
+    }
+
+    if (tmp_bitmap == NULL)
+      tmp_bitmap = CreateBitmap(tmp_bitmap_xsize, tmp_bitmap_ysize,
+				DEFAULT_DEPTH);
+
+    sysCopyArea(src_bitmap, tmp_bitmap,
+		src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE);
+    sysCopyArea(tmp_bitmap, dst_bitmap,
+		dst_x, dst_y, width, height, dst_x, dst_y, BLIT_OPAQUE);
+
+    return;
+  }
+#endif
+
+  sysCopyArea(src_bitmap, dst_bitmap,
+	      src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE);
 }
 
-void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
+void BlitBitmapTiled(Bitmap *src_bitmap, Bitmap *dst_bitmap,
+		     int src_x, int src_y, int src_width, int src_height,
+		     int dst_x, int dst_y, int dst_width, int dst_height)
+{
+  int src_xsize = (src_width  == 0 ? src_bitmap->width  : src_width);
+  int src_ysize = (src_height == 0 ? src_bitmap->height : src_height);
+  int dst_xsize = dst_width;
+  int dst_ysize = dst_height;
+  int src_xsteps = (dst_xsize + src_xsize - 1) / src_xsize;
+  int src_ysteps = (dst_ysize + src_ysize - 1) / src_ysize;
+  int x, y;
+
+  for (y = 0; y < src_ysteps; y++)
+  {
+    for (x = 0; x < src_xsteps; x++)
+    {
+      int draw_x = dst_x + x * src_xsize;
+      int draw_y = dst_y + y * src_ysize;
+      int draw_xsize = MIN(src_xsize, dst_xsize - x * src_xsize);
+      int draw_ysize = MIN(src_ysize, dst_ysize - y * src_ysize);
+
+      BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, draw_xsize, draw_ysize,
+		 draw_x, draw_y);
+    }
+  }
+}
+
+void FadeRectangle(int x, int y, int width, int height,
 		   int fade_mode, int fade_delay, int post_delay,
 		   void (*draw_border_function)(void))
 {
-#if defined(TARGET_SDL)
-  SDLFadeRectangle(bitmap_cross, x, y, width, height,
-		   fade_mode, fade_delay, post_delay, draw_border_function);
-#else
-  X11FadeRectangle(bitmap_cross, x, y, width, height,
+  /* (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) */
+  if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE))
+    return;
+
+  SDLFadeRectangle(x, y, width, height,
 		   fade_mode, fade_delay, post_delay, draw_border_function);
-#endif
 }
 
 void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height,
@@ -514,6 +695,9 @@ void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height,
   if (DrawingDeactivated(x, y, width, height))
     return;
 
+  if (!InClippedRectangle(bitmap, &x, &y, &width, &height, TRUE))
+    return;
+
   sysFillRectangle(bitmap, x, y, width, height, color);
 }
 
@@ -531,28 +715,6 @@ void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y,
     ClearRectangle(bitmap, x, y, width, height);
 }
 
-void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
-{
-#if defined(TARGET_X11)
-  if (clip_gc)
-  {
-    bitmap->clip_gc = clip_gc;
-    XSetClipMask(display, bitmap->clip_gc, clip_pixmap);
-  }
-#endif
-}
-
-void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
-{
-#if defined(TARGET_X11)
-  if (clip_gc)
-  {
-    bitmap->clip_gc = clip_gc;
-    XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y);
-  }
-#endif
-}
-
 void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 		      int src_x, int src_y, int width, int height,
 		      int dst_x, int dst_y)
@@ -575,8 +737,6 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 	       dst_x, dst_y);
 
     /* draw foreground */
-    SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-		  dst_x - src_x, dst_y - src_y);
     BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height,
 		     dst_x, dst_y);
   }
@@ -585,27 +745,68 @@ 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)
 {
-#if defined(TARGET_SDL)
   SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL);
-#else
-  X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL);
-#endif
 }
 
 void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
 			 int to_x, int to_y)
 {
-#if defined(TARGET_SDL)
   SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
-#else
-  X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
-#endif
 }
 
-#if !defined(TARGET_X11_NATIVE)
 void DrawLine(Bitmap *bitmap, int from_x, int from_y,
 	      int to_x, int to_y, Pixel pixel, int line_width)
 {
@@ -624,21 +825,14 @@ void DrawLine(Bitmap *bitmap, int from_x, int from_y,
 	  (x == line_width - 1 && y == line_width - 1))
 	continue;
 
-#if defined(TARGET_SDL)
       SDLDrawLine(bitmap,
 		  from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel);
-#elif defined(TARGET_ALLEGRO)
-      AllegroDrawLine(bitmap->drawable, from_x + dx, from_y + dy,
-		      to_x + dx, to_y + dy, pixel);
-#endif
     }
   }
 }
-#endif
 
 void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel)
 {
-#if !defined(TARGET_X11_NATIVE)
   int line_width = 4;
   int i;
 
@@ -649,11 +843,6 @@ void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel)
   /*
   SDLDrawLines(bitmap->surface, points, num_points, pixel);
   */
-#else
-  XSetForeground(display, bitmap->line_gc[1], pixel);
-  XDrawLines(display, bitmap->drawable, bitmap->line_gc[1],
-	     (XPoint *)points, num_points, CoordModeOrigin);
-#endif
 }
 
 Pixel GetPixel(Bitmap *bitmap, int x, int y)
@@ -662,25 +851,13 @@ Pixel GetPixel(Bitmap *bitmap, int x, int y)
       y < 0 || y >= bitmap->height)
     return BLACK_PIXEL;
 
-#if defined(TARGET_SDL)
   return SDLGetPixel(bitmap, x, y);
-#elif defined(TARGET_ALLEGRO)
-  return AllegroGetPixel(bitmap->drawable, x, y);
-#else
-  return X11GetPixel(bitmap, x, y);
-#endif
 }
 
 Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
 		      unsigned int color_g, unsigned int color_b)
 {
-#if defined(TARGET_SDL)
   return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b);
-#elif defined(TARGET_ALLEGRO)
-  return AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8);
-#else
-  return X11GetPixelFromRGB(color_r, color_g, color_b);
-#endif
 }
 
 Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
@@ -692,90 +869,47 @@ Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
   return GetPixelFromRGB(bitmap, color_r, color_g, color_b);
 }
 
-/* execute all pending screen drawing operations */
-void FlushDisplay(void)
-{
-#ifndef TARGET_SDL
-  XFlush(display);
-#endif
-}
-
-/* execute and wait for all pending screen drawing operations */
-void SyncDisplay(void)
-{
-#ifndef TARGET_SDL
-  XSync(display, FALSE);
-#endif
-}
-
 void KeyboardAutoRepeatOn(void)
 {
-#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+  keyrepeat_status = TRUE;
+#else
   SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2,
 		      SDL_DEFAULT_REPEAT_INTERVAL / 2);
   SDL_EnableUNICODE(1);
-#else
-  if (display)
-    XAutoRepeatOn(display);
 #endif
 }
 
 void KeyboardAutoRepeatOff(void)
 {
-#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+  keyrepeat_status = FALSE;
+#else
   SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
   SDL_EnableUNICODE(0);
-#else
-  if (display)
-    XAutoRepeatOff(display);
 #endif
 }
 
-boolean PointerInWindow(DrawWindow *window)
+boolean SetVideoMode(boolean fullscreen)
 {
-#if defined(TARGET_SDL)
-  return TRUE;
-#else
-  Window root, child;
-  int root_x, root_y;
-  unsigned int mask;
-  int win_x, win_y;
-
-  /* if XQueryPointer() returns False, the pointer
-     is not on the same screen as the specified window */
-  return XQueryPointer(display, window->drawable, &root, &child,
-		       &root_x, &root_y, &win_x, &win_y, &mask);
-#endif
+  return SDLSetVideoMode(fullscreen);
 }
 
-boolean SetVideoMode(boolean fullscreen)
+void SetVideoFrameDelay(unsigned int frame_delay_value)
 {
-#if defined(TARGET_SDL)
-  return SDLSetVideoMode(&backbuffer, fullscreen);
-#else
-  boolean success = TRUE;
-
-  if (fullscreen && video.fullscreen_available)
-  {
-    Error(ERR_WARN, "fullscreen not available in X11 version");
-
-    /* display error message only once */
-    video.fullscreen_available = FALSE;
-
-    success = FALSE;
-  }
+  video.frame_delay_value = frame_delay_value;
+}
 
-  return success;
-#endif
+unsigned int GetVideoFrameDelay()
+{
+  return video.frame_delay_value;
 }
 
 boolean ChangeVideoModeIfNeeded(boolean fullscreen)
 {
-#if defined(TARGET_SDL)
   if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)||
       (!fullscreen && video.fullscreen_enabled))
     fullscreen = SetVideoMode(fullscreen);
-#endif
 
   return fullscreen;
 }
@@ -784,11 +918,7 @@ Bitmap *LoadImage(char *filename)
 {
   Bitmap *new_bitmap;
 
-#if defined(TARGET_SDL)
   new_bitmap = SDLLoadImage(filename);
-#else
-  new_bitmap = X11LoadImage(filename);
-#endif
 
   if (new_bitmap)
     new_bitmap->source_filename = getStringCopy(filename);
@@ -805,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;
 }
@@ -832,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;
   }
 
@@ -849,57 +979,121 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
   free(new_bitmap);
 }
 
-Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
+static Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
 {
-  Bitmap *dst_bitmap = CreateBitmap(zoom_width, zoom_height, DEFAULT_DEPTH);
+  return SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
+}
 
-#if defined(TARGET_SDL)
-  SDLZoomBitmap(src_bitmap, dst_bitmap);
-#else
-  X11ZoomBitmap(src_bitmap, dst_bitmap);
-#endif
+void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
+{
+  if (bitmaps[IMG_BITMAP_CUSTOM])
+  {
+    FreeBitmap(bitmaps[IMG_BITMAP_CUSTOM]);
+
+    bitmaps[IMG_BITMAP_CUSTOM] = NULL;
+  }
 
-  return dst_bitmap;
+  if (gfx.game_tile_size == gfx.standard_tile_size)
+  {
+    bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD];
+
+    return;
+  }
+
+  Bitmap *bitmap = bitmaps[IMG_BITMAP_STANDARD];
+  int width  = bitmap->width  * gfx.game_tile_size / gfx.standard_tile_size;;
+  int height = bitmap->height * gfx.game_tile_size / gfx.standard_tile_size;;
+
+  Bitmap *bitmap_new = ZoomBitmap(bitmap, width, height);
+
+  bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new;
+  bitmaps[IMG_BITMAP_GAME]   = bitmap_new;
 }
 
-static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
-				boolean create_small_bitmaps)
+static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
+				int tile_size, boolean create_small_bitmaps)
 {
-  Bitmap swap_bitmap;
-  Bitmap *new_bitmap;
-  Bitmap *tmp_bitmap_1;
-  Bitmap *tmp_bitmap_2;
-  Bitmap *tmp_bitmap_4;
-  Bitmap *tmp_bitmap_8;
-  Bitmap *tmp_bitmap_16;
-  Bitmap *tmp_bitmap_32;
+  Bitmap *old_bitmap = bitmaps[IMG_BITMAP_STANDARD];
+  Bitmap *tmp_bitmap_final = NULL;
+  Bitmap *tmp_bitmap_0 = NULL;
+  Bitmap *tmp_bitmap_1 = NULL;
+  Bitmap *tmp_bitmap_2 = NULL;
+  Bitmap *tmp_bitmap_4 = NULL;
+  Bitmap *tmp_bitmap_8 = NULL;
+  Bitmap *tmp_bitmap_16 = NULL;
+  Bitmap *tmp_bitmap_32 = NULL;
+  int width_final, height_final;
+  int width_0, height_0;
   int width_1, height_1;
   int width_2, height_2;
   int width_4, height_4;
   int width_8, height_8;
   int width_16, height_16;
   int width_32, height_32;
-  int new_width, new_height;
+  int old_width, old_height;
+  int i;
+
+  print_timestamp_init("CreateScaledBitmaps");
 
-  /* calculate new image dimensions for normal sized image */
-  width_1  = old_bitmap->width  * zoom_factor;
-  height_1 = old_bitmap->height * zoom_factor;
+  old_width  = old_bitmap->width;
+  old_height = old_bitmap->height;
 
-  /* get image with normal size (this might require scaling up) */
+  /* calculate new image dimensions for final image size */
+  width_final  = old_width  * zoom_factor;
+  height_final = old_height * zoom_factor;
+
+  /* get image with final size (this might require scaling up) */
+  /* ("final" size may result in non-standard tile size image) */
   if (zoom_factor != 1)
-    tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1);
+    tmp_bitmap_final = ZoomBitmap(old_bitmap, width_final, height_final);
   else
-    tmp_bitmap_1 = old_bitmap;
+    tmp_bitmap_final = old_bitmap;
+
+  UPDATE_BUSY_STATE();
 
-  /* this is only needed to make compilers happy */
-  tmp_bitmap_2 = NULL;
-  tmp_bitmap_4 = NULL;
-  tmp_bitmap_8 = NULL;
-  tmp_bitmap_16 = NULL;
-  tmp_bitmap_32 = NULL;
+  width_0  = width_1  = width_final;
+  height_0 = height_1 = height_final;
+
+  tmp_bitmap_0 = tmp_bitmap_1 = tmp_bitmap_final;
 
   if (create_small_bitmaps)
   {
+    /* check if we have a non-gameplay tile size image */
+    if (tile_size != gfx.game_tile_size)
+    {
+      /* get image with gameplay tile size */
+      width_0  = width_final  * gfx.game_tile_size / tile_size;
+      height_0 = height_final * gfx.game_tile_size / tile_size;
+
+      if (width_0 == old_width)
+	tmp_bitmap_0 = old_bitmap;
+      else if (width_0 == width_final)
+	tmp_bitmap_0 = tmp_bitmap_final;
+      else
+	tmp_bitmap_0 = ZoomBitmap(old_bitmap, width_0, height_0);
+
+      UPDATE_BUSY_STATE();
+    }
+
+    /* check if we have a non-standard tile size image */
+    if (tile_size != gfx.standard_tile_size)
+    {
+      /* get image with standard tile size */
+      width_1  = width_final  * gfx.standard_tile_size / tile_size;
+      height_1 = height_final * gfx.standard_tile_size / tile_size;
+
+      if (width_1 == old_width)
+	tmp_bitmap_1 = old_bitmap;
+      else if (width_1 == width_final)
+	tmp_bitmap_1 = tmp_bitmap_final;
+      else if (width_1 == width_0)
+	tmp_bitmap_1 = tmp_bitmap_0;
+      else
+	tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1);
+
+      UPDATE_BUSY_STATE();
+    }
+
     /* calculate new image dimensions for small images */
     width_2  = width_1  / 2;
     height_2 = height_1 / 2;
@@ -912,180 +1106,99 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
     width_32  = width_1  / 32;
     height_32 = height_1 / 32;
 
-    UPDATE_BUSY_STATE();
-
     /* get image with 1/2 of normal size (for use in the level editor) */
-    if (zoom_factor != 2)
-      tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_1 / 2, height_1 / 2);
-    else
+    if (width_2 == old_width)
       tmp_bitmap_2 = old_bitmap;
+    else
+      tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_2, height_2);
 
     UPDATE_BUSY_STATE();
 
     /* get image with 1/4 of normal size (for use in the level editor) */
-    if (zoom_factor != 4)
-      tmp_bitmap_4 = ZoomBitmap(tmp_bitmap_2, width_2 / 2, height_2 / 2);
-    else
+    if (width_4 == old_width)
       tmp_bitmap_4 = old_bitmap;
+    else
+      tmp_bitmap_4 = ZoomBitmap(tmp_bitmap_2, width_4, height_4);
 
     UPDATE_BUSY_STATE();
 
     /* get image with 1/8 of normal size (for use on the preview screen) */
-    if (zoom_factor != 8)
-      tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2);
-    else
+    if (width_8 == old_width)
       tmp_bitmap_8 = old_bitmap;
+    else
+      tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_8, height_8);
 
     UPDATE_BUSY_STATE();
 
     /* get image with 1/16 of normal size (for use on the preview screen) */
-    if (zoom_factor != 16)
-      tmp_bitmap_16 = ZoomBitmap(tmp_bitmap_8, width_8 / 2, height_8 / 2);
-    else
+    if (width_16 == old_width)
       tmp_bitmap_16 = old_bitmap;
+    else
+      tmp_bitmap_16 = ZoomBitmap(tmp_bitmap_8, width_16, height_16);
 
     UPDATE_BUSY_STATE();
 
     /* get image with 1/32 of normal size (for use on the preview screen) */
-    if (zoom_factor != 32)
-      tmp_bitmap_32 = ZoomBitmap(tmp_bitmap_16, width_16 / 2, height_16 / 2);
-    else
+    if (width_32 == old_width)
       tmp_bitmap_32 = old_bitmap;
+    else
+      tmp_bitmap_32 = ZoomBitmap(tmp_bitmap_16, width_32, height_32);
 
     UPDATE_BUSY_STATE();
-  }
 
-#if 0
-  /* if image was scaled up, create new clipmask for normal size image */
-  if (zoom_factor != 1)
-  {
-#if defined(TARGET_X11)
-    if (old_bitmap->clip_mask)
-      XFreePixmap(display, old_bitmap->clip_mask);
-
-    old_bitmap->clip_mask =
-      Pixmap_to_Mask(tmp_bitmap_1->drawable, width_1, height_1);
+    bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
+    bitmaps[IMG_BITMAP_16x16] = tmp_bitmap_2;
+    bitmaps[IMG_BITMAP_8x8]   = tmp_bitmap_4;
+    bitmaps[IMG_BITMAP_4x4]   = tmp_bitmap_8;
+    bitmaps[IMG_BITMAP_2x2]   = tmp_bitmap_16;
+    bitmaps[IMG_BITMAP_1x1]   = tmp_bitmap_32;
 
-    XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask);
-#else
-    SDL_Surface *tmp_surface_1 = tmp_bitmap_1->surface;
+    if (width_0 != width_1)
+      bitmaps[IMG_BITMAP_CUSTOM] = tmp_bitmap_0;
 
-    if (old_bitmap->surface_masked)
-      SDL_FreeSurface(old_bitmap->surface_masked);
+    if (bitmaps[IMG_BITMAP_CUSTOM])
+      bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_CUSTOM];
+    else
+      bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD];
 
-    SDL_SetColorKey(tmp_surface_1, SDL_SRCCOLORKEY,
-		    SDL_MapRGB(tmp_surface_1->format, 0x00, 0x00, 0x00));
-    if ((old_bitmap->surface_masked = SDL_DisplayFormat(tmp_surface_1)) ==NULL)
-      Error(ERR_EXIT, "SDL_DisplayFormat() failed");
-    SDL_SetColorKey(tmp_surface_1, 0, 0);	/* reset transparent pixel */
-#endif
-  }
-#endif
+    boolean free_old_bitmap = TRUE;
 
-  if (create_small_bitmaps)
-  {
-    new_width  = width_1;
-    new_height = height_1 + (height_1 + 1) / 2;     /* prevent odd height */
-
-    new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
-
-    BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0);
-    BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2,
-	       0, height_1);
-    BlitBitmap(tmp_bitmap_4, new_bitmap, 0, 0, width_1 / 4, height_1 / 4,
-	       width_1 / 2, height_1);
-    BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
-	       3 * width_1 / 4, height_1);
-    BlitBitmap(tmp_bitmap_16, new_bitmap, 0, 0, width_1 / 16, height_1 / 16,
-	       7 * width_1 / 8, height_1);
-    BlitBitmap(tmp_bitmap_32, new_bitmap, 0, 0, width_1 / 32, height_1 / 32,
-	       15 * width_1 / 16, height_1);
+    for (i = 0; i < NUM_IMG_BITMAPS; i++)
+      if (bitmaps[i] == old_bitmap)
+	free_old_bitmap = FALSE;
 
-    UPDATE_BUSY_STATE();
+    if (free_old_bitmap)
+      FreeBitmap(old_bitmap);
   }
   else
   {
-    new_width  = width_1;
-    new_height = height_1;
-
-    new_bitmap = tmp_bitmap_1;	/* directly use tmp_bitmap_1 as new bitmap */
-  }
-
-  if (create_small_bitmaps)
-  {
-    /* if no small bitmaps created, tmp_bitmap_1 is used as new bitmap now */
-    if (zoom_factor != 1)
-      FreeBitmap(tmp_bitmap_1);
-
-    if (zoom_factor != 2)
-      FreeBitmap(tmp_bitmap_2);
-
-    if (zoom_factor != 4)
-      FreeBitmap(tmp_bitmap_4);
-
-    if (zoom_factor != 8)
-      FreeBitmap(tmp_bitmap_8);
-
-    if (zoom_factor != 16)
-      FreeBitmap(tmp_bitmap_16);
-
-    if (zoom_factor != 32)
-      FreeBitmap(tmp_bitmap_32);
+    bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
   }
 
-  /* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */
-#if defined(TARGET_SDL)
-  swap_bitmap.surface = old_bitmap->surface;
-  old_bitmap->surface = new_bitmap->surface;
-  new_bitmap->surface = swap_bitmap.surface;
-#else
-  swap_bitmap.drawable = old_bitmap->drawable;
-  old_bitmap->drawable = new_bitmap->drawable;
-  new_bitmap->drawable = swap_bitmap.drawable;
-#endif
-
-  old_bitmap->width  = new_bitmap->width;
-  old_bitmap->height = new_bitmap->height;
-
-#if 1
-  /* this replaces all blit masks created when loading -- maybe optimize this */
-  {
-#if defined(TARGET_X11)
-    if (old_bitmap->clip_mask)
-      XFreePixmap(display, old_bitmap->clip_mask);
-
-    old_bitmap->clip_mask =
-      Pixmap_to_Mask(old_bitmap->drawable, new_width, new_height);
-
-    XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask);
-#else
-    SDL_Surface *old_surface = old_bitmap->surface;
-
-    if (old_bitmap->surface_masked)
-      SDL_FreeSurface(old_bitmap->surface_masked);
+  UPDATE_BUSY_STATE();
 
-    SDL_SetColorKey(old_surface, SDL_SRCCOLORKEY,
-		    SDL_MapRGB(old_surface->format, 0x00, 0x00, 0x00));
-    if ((old_bitmap->surface_masked = SDL_DisplayFormat(old_surface)) ==NULL)
-      Error(ERR_EXIT, "SDL_DisplayFormat() failed");
-    SDL_SetColorKey(old_surface, 0, 0);		/* reset transparent pixel */
-#endif
-  }
-#endif
+  print_timestamp_done("CreateScaledBitmaps");
+}
 
-  UPDATE_BUSY_STATE();
+void CreateBitmapWithSmallBitmaps(Bitmap **bitmaps, int zoom_factor,
+				  int tile_size)
+{
+  CreateScaledBitmaps(bitmaps, zoom_factor, tile_size, TRUE);
+}
 
-  FreeBitmap(new_bitmap);	/* this actually frees the _old_ bitmap now */
+void CreateBitmapTextures(Bitmap **bitmaps)
+{
+  SDLCreateBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]);
 }
 
-void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor)
+void FreeBitmapTextures(Bitmap **bitmaps)
 {
-  CreateScaledBitmaps(old_bitmap, zoom_factor, TRUE);
+  SDLFreeBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]);
 }
 
-void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
+void ScaleBitmap(Bitmap **bitmaps, int zoom_factor)
 {
-  CreateScaledBitmaps(old_bitmap, zoom_factor, FALSE);
+  CreateScaledBitmaps(bitmaps, zoom_factor, 0, FALSE);
 }
 
 
@@ -1093,8 +1206,8 @@ void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
 /* mouse pointer functions                                                   */
 /* ------------------------------------------------------------------------- */
 
-#if !defined(PLATFORM_MSDOS)
 #define USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER		0
+
 /* XPM image definitions */
 static const char *cursor_image_none[] =
 {
@@ -1127,6 +1240,7 @@ static const char *cursor_image_none[] =
   /* hot spot */
   "0,0"
 };
+
 #if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER
 static const char *cursor_image_dot[] =
 {
@@ -1166,11 +1280,7 @@ static const char **cursor_image_playfield = cursor_image_dot;
 static const char **cursor_image_playfield = cursor_image_none;
 #endif
 
-#if defined(TARGET_SDL)
 static const int cursor_bit_order = BIT_ORDER_MSB;
-#elif defined(TARGET_X11_NATIVE)
-static const int cursor_bit_order = BIT_ORDER_LSB;
-#endif
 
 static struct MouseCursorInfo *get_cursor_from_image(const char **image)
 {
@@ -1218,11 +1328,9 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image)
 
   return cursor;
 }
-#endif	/* !PLATFORM_MSDOS */
 
 void SetMouseCursor(int mode)
 {
-#if !defined(PLATFORM_MSDOS)
   static struct MouseCursorInfo *cursor_none = NULL;
   static struct MouseCursorInfo *cursor_playfield = NULL;
   struct MouseCursorInfo *cursor_new;
@@ -1237,12 +1345,9 @@ void SetMouseCursor(int mode)
 		mode == CURSOR_NONE      ? cursor_none :
 		mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
 
-#if defined(TARGET_SDL)
   SDLSetMouseCursor(cursor_new);
-#elif defined(TARGET_X11_NATIVE)
-  X11SetMouseCursor(cursor_new);
-#endif
-#endif
+
+  gfx.cursor_mode = mode;
 }
 
 
@@ -1269,24 +1374,12 @@ void OpenAudio(void)
   audio.music_channel = 0;
   audio.first_sound_channel = 0;
 
-#if defined(TARGET_SDL)
   SDLOpenAudio();
-#elif defined(PLATFORM_UNIX)
-  UnixOpenAudio();
-#elif defined(PLATFORM_MSDOS)
-  MSDOSOpenAudio();
-#endif
 }
 
 void CloseAudio(void)
 {
-#if defined(TARGET_SDL)
   SDLCloseAudio();
-#elif defined(PLATFORM_UNIX)
-  UnixCloseAudio();
-#elif defined(PLATFORM_MSDOS)
-  MSDOSCloseAudio();
-#endif
 
   audio.sound_enabled = FALSE;
 }
@@ -1306,44 +1399,41 @@ void SetAudioMode(boolean enabled)
 
 void InitEventFilter(EventFilter filter_function)
 {
-#if defined(TARGET_SDL)
   /* set event filter to filter out certain events */
+#if defined(TARGET_SDL2)
+  SDL_SetEventFilter(filter_function, NULL);
+#else
   SDL_SetEventFilter(filter_function);
 #endif
 }
 
 boolean PendingEvent(void)
 {
-#if defined(TARGET_SDL)
   return (SDL_PollEvent(NULL) ? TRUE : FALSE);
-#else
-  return (XPending(display) ? TRUE : FALSE);
-#endif
 }
 
 void NextEvent(Event *event)
 {
-#if defined(TARGET_SDL)
   SDLNextEvent(event);
-#else
-  XNextEvent(display, event);
-#endif
 }
 
 void PeekEvent(Event *event)
 {
-#if defined(TARGET_SDL)
-  SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS);
+#if defined(TARGET_SDL2)
+  SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
 #else
-  XPeekEvent(display, event);
+  SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS);
 #endif
 }
 
 Key GetEventKey(KeyEvent *event, boolean with_modifiers)
 {
-#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+  /* key up/down events in SDL2 do not return text characters anymore */
+  return event->keysym.sym;
+#else
 
-#if 0
+#if ENABLE_UNUSED_CODE
   printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n",
 	 (int)event->keysym.unicode,
 	 (int)event->keysym.sym,
@@ -1357,18 +1447,6 @@ Key GetEventKey(KeyEvent *event, boolean with_modifiers)
   else
     return event->keysym.sym;
 
-#else
-
-#if 0
-  printf("with modifiers == '0x%04x', without modifiers == '0x%04x'\n",
-	 (int)XLookupKeysym(event, event->state),
-	 (int)XLookupKeysym(event, 0));
-#endif
-
-  if (with_modifiers)
-    return XLookupKeysym(event, event->state);
-  else
-    return XLookupKeysym(event, 0);
 #endif
 }
 
@@ -1421,11 +1499,7 @@ KeyMod HandleKeyModState(Key key, int key_status)
 
 KeyMod GetKeyModState()
 {
-#if defined(TARGET_SDL)
   return (KeyMod)SDL_GetModState();
-#else
-  return HandleKeyModState(KSYM_UNDEFINED, 0);
-#endif
 }
 
 KeyMod GetKeyModStateFromEvents()
@@ -1439,20 +1513,35 @@ 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)
     return FALSE;
 
-#if defined(TARGET_SDL)
   return TRUE;		/* the only possible message here is SDL_QUIT */
-#elif defined(PLATFORM_UNIX)
-  if ((event->window == window->drawable) &&
-      (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
-    return TRUE;
-#endif
-
-  return FALSE;
 }
 
 
@@ -1473,27 +1562,10 @@ void InitJoysticks()
   for (i = 0; i < MAX_PLAYERS; i++)
     joystick.fd[i] = -1;		/* joystick device closed */
 
-#if defined(TARGET_SDL)
   SDLInitJoysticks();
-#elif defined(PLATFORM_UNIX)
-  UnixInitJoysticks();
-#elif defined(PLATFORM_MSDOS)
-  MSDOSInitJoysticks();
-#endif
-
-#if 0
-  for (i = 0; i < MAX_PLAYERS; i++)
-    printf("::: Joystick for player %d: %d\n", i, joystick.fd[i]);
-#endif
 }
 
 boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
 {
-#if defined(TARGET_SDL)
   return SDLReadJoystick(nr, x, y, b1, b2);
-#elif defined(PLATFORM_UNIX)
-  return UnixReadJoystick(nr, x, y, b1, b2);
-#elif defined(PLATFORM_MSDOS)
-  return MSDOSReadJoystick(nr, x, y, b1, b2);
-#endif
 }