-/***********************************************************
-* Artsoft Retro-Game Library *
-*----------------------------------------------------------*
-* (c) 1994-2002 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"
struct JoystickInfo joystick;
struct SetupInfo setup;
+LevelDirTree *leveldir_first_all = NULL;
LevelDirTree *leveldir_first = NULL;
LevelDirTree *leveldir_current = NULL;
int level_nr;
+struct LevelStats level_stats[MAX_LEVELS];
+
Display *display = NULL;
Visual *visual = NULL;
int screen = 0;
int button_status = MB_NOT_PRESSED;
boolean motion_status = FALSE;
+#if defined(TARGET_SDL2)
+boolean keyrepeat_status = TRUE;
+#endif
int redraw_mask = REDRAW_NONE;
int redraw_tiles = 0;
/* ========================================================================= */
void InitProgramInfo(char *argv0,
- char *userdata_directory, char *program_title,
- char *window_title, char *icon_title,
- char *x11_icon_filename, char *x11_iconmask_filename,
- char *msdos_cursor_filename,
- char *cookie_prefix, char *filename_prefix,
+ char *userdata_subdir, char *userdata_subdir_unix,
+ char *program_title, char *icon_title,
+ char *sdl_icon_filename, char *cookie_prefix,
int program_version)
{
program.command_basepath = getBasePath(argv0);
program.command_basename = getBaseName(argv0);
- program.userdata_directory = userdata_directory;
+ 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.msdos_cursor_filename = msdos_cursor_filename;
+
+ program.sdl_icon_filename = sdl_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.error_filename = getErrorFilename(ERROR_BASENAME);
+ program.error_file = stderr;
+}
+
+void SetWindowTitle()
+{
+ program.window_title = program.window_title_function();
+
+#if defined(TARGET_SDL)
+ SDLSetWindowTitle();
+#endif
+}
+
+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))
void InitPlatformDependentStuff(void)
{
-#if defined(PLATFORM_MSDOS)
- _fmode = O_BINARY;
- initErrorFile();
+ // this is initialized in GetOptions(), but may already be used before
+ options.verbose = TRUE;
+
+#if defined(PLATFORM_MACOSX)
+ updateUserGameDataDir();
+#endif
+
+#if 1
+ openErrorFile();
+#else
+#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX)
+ openErrorFile();
+#endif
#endif
#if defined(TARGET_SDL)
- if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
+#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 (SDL_Init(sdl_init_flags) < 0)
Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
SDLNet_Init();
void ClosePlatformDependentStuff(void)
{
-#if defined(PLATFORM_MSDOS)
- dumpErrorFile();
+#if defined(PLATFORM_WIN32)
+ closeErrorFile();
#endif
}
gfx.field_save_buffer = field_save_buffer;
+#if 0
gfx.background_bitmap = NULL;
gfx.background_bitmap_mask = REDRAW_NONE;
+#endif
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;
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)
+{
+ gfx.win_xsize = win_xsize;
+ gfx.win_ysize = win_ysize;
+
+#if 1
+ gfx.background_bitmap_mask = REDRAW_NONE;
+
+ ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
+#endif
+}
+
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 InitGfxCustomArtworkInfo()
+{
+ gfx.override_level_graphics = FALSE;
+ gfx.override_level_sounds = FALSE;
+ gfx.override_level_music = FALSE;
+
+ gfx.draw_init_text = TRUE;
+}
+
void SetDrawDeactivationMask(int draw_deactivation_mask)
{
gfx.draw_deactivation_mask = draw_deactivation_mask;
gfx.draw_background_mask = draw_background_mask;
}
+#if 0
+
static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile,
int dest_x, int dest_y, int width, int height)
{
else
gfx.background_bitmap_mask &= ~mask;
+#if 0
if (gfx.background_bitmap == NULL)
gfx.background_bitmap = CreateBitmap(video.width, video.height,
DEFAULT_DEPTH);
+#endif
if (background_bitmap_tile == NULL) /* empty background requested */
return;
- if (mask == REDRAW_FIELD)
+ if (mask == REDRAW_ALL)
+ DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
+ 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);
else if (mask == REDRAW_DOOR_1)
- {
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.dx, gfx.dy,
gfx.dxsize, gfx.dysize);
- }
+}
+
+#else
+
+void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
+{
+ if (background_bitmap_tile != NULL)
+ gfx.background_bitmap_mask |= mask;
+ else
+ gfx.background_bitmap_mask &= ~mask;
+
+#if 0
+ if (gfx.background_bitmap == NULL)
+ gfx.background_bitmap = CreateBitmap(video.width, video.height,
+ DEFAULT_DEPTH);
+#endif
+
+ if (background_bitmap_tile == NULL) /* empty background requested */
+ return;
+
+ if (mask == REDRAW_ALL)
+ BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0,
+ 0, 0, video.width, video.height);
+ else if (mask == REDRAW_FIELD)
+ 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)
+ BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0,
+ gfx.dx, gfx.dy, gfx.dxsize, gfx.dysize);
+}
+
+#endif
+
+void SetWindowBackgroundBitmap(Bitmap *background_bitmap_tile)
+{
+ /* remove every mask before setting mask for window */
+ /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */
+ SetBackgroundBitmap(NULL, 0xffff); /* !!! FIX THIS !!! */
+ SetBackgroundBitmap(background_bitmap_tile, REDRAW_ALL);
}
void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile)
{
+ /* remove window area mask before setting mask for main area */
+ /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */
+ SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */
SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD);
}
void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile)
{
+ /* remove window area mask before setting mask for door area */
+ /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */
+ SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */
SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1);
}
inline static void sysFillRectangle(Bitmap *bitmap, int x, int y,
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
}
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
}
-inline void InitVideoDisplay(void)
+void LimitScreenUpdates(boolean enable)
{
#if defined(TARGET_SDL)
- SDLInitVideoDisplay();
-#else
- X11InitVideoDisplay();
+ SDLLimitScreenUpdates(enable);
#endif
}
-inline void CloseVideoDisplay(void)
+void InitVideoDisplay(void)
+{
+ SDLInitVideoDisplay();
+}
+
+void CloseVideoDisplay(void)
{
KeyboardAutoRepeatOn();
#endif
}
-inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
- int width, int height, int depth,
- boolean fullscreen)
+void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
{
+#if 0
+ printf("::: InitVideoBuffer\n");
+#endif
+
video.width = width;
video.height = height;
video.depth = GetRealDepth(depth);
+
video.fullscreen_available = FULLSCREEN_STATUS;
video.fullscreen_enabled = FALSE;
-
-#if defined(TARGET_SDL)
- SDLInitVideoBuffer(backbuffer, window, fullscreen);
-#else
- X11InitVideoBuffer(backbuffer, window);
-#endif
-}
-
-inline Bitmap *CreateBitmapStruct(void)
-{
-#if defined(TARGET_SDL)
- return checked_calloc(sizeof(struct SDLSurfaceInfo));
-#else
- return checked_calloc(sizeof(struct X11DrawableInfo));
+ // video.fullscreen_initial = FALSE;
+#if 0
+ video.fullscreen_mode_current = NULL;
+ video.fullscreen_modes = NULL;
#endif
-}
-inline Bitmap *CreateBitmap(int width, int height, int depth)
-{
- Bitmap *new_bitmap = CreateBitmapStruct();
- int real_depth = GetRealDepth(depth);
-
-#if defined(TARGET_SDL)
- SDLCreateBitmapContent(new_bitmap, width, height, real_depth);
-#else
- X11CreateBitmapContent(new_bitmap, width, height, real_depth);
-#endif
+ video.window_scaling_available = WINDOW_SCALING_STATUS;
- new_bitmap->width = width;
- new_bitmap->height = height;
+ SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
- return new_bitmap;
+ drawto = backbuffer;
}
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;
*dst_bitmap = *src_bitmap;
}
-inline void FreeBitmap(Bitmap *bitmap)
+void FreeBitmap(Bitmap *bitmap)
{
if (bitmap == NULL)
return;
free(bitmap);
}
-inline void CloseWindow(DrawWindow *window)
+Bitmap *CreateBitmapStruct(void)
+{
+ return checked_calloc(sizeof(struct SDLSurfaceInfo));
+}
+
+Bitmap *CreateBitmap(int width, int height, int depth)
{
-#if defined(TARGET_X11)
- if (window->drawable)
+ 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, int depth)
+{
+ Bitmap *new_bitmap = CreateBitmap(width, height, 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
}
-static inline boolean CheckDrawingArea(int x, int y, int width, int height,
+void CloseWindow(DrawWindow *window)
+{
+}
+
+inline static boolean CheckDrawingArea(int x, int y, int width, int height,
int draw_mask)
{
if (draw_mask == REDRAW_NONE)
if (draw_mask & REDRAW_ALL)
return TRUE;
- if ((draw_mask & REDRAW_FIELD) && x < gfx.real_sx + gfx.full_sxsize)
+#if 1
+ if ((draw_mask & REDRAW_FIELD) && IN_GFX_FIELD_FULL(x, y))
return TRUE;
- if ((draw_mask & REDRAW_DOOR_1) && x >= gfx.dx && y < gfx.dy + gfx.dysize)
+ if ((draw_mask & REDRAW_DOOR_1) && IN_GFX_DOOR_1(x, y))
return TRUE;
- if ((draw_mask & REDRAW_DOOR_2) && x >= gfx.dx && y >= gfx.vy)
+ if ((draw_mask & REDRAW_DOOR_2) && IN_GFX_DOOR_2(x, y))
return TRUE;
+ if ((draw_mask & REDRAW_DOOR_3) && IN_GFX_DOOR_3(x, y))
+ return TRUE;
+#else
+ if ((draw_mask & REDRAW_FIELD) &&
+ x >= gfx.real_sx && x < gfx.real_sx + gfx.full_sxsize)
+ return TRUE;
+
+ if ((draw_mask & REDRAW_DOOR_1) &&
+ x >= gfx.dx && y < gfx.dy + gfx.dysize)
+ return TRUE;
+
+ if ((draw_mask & REDRAW_DOOR_2) &&
+ x >= gfx.dx && y >= gfx.vy)
+ return TRUE;
+#endif
+
return FALSE;
}
-inline boolean DrawingDeactivated(int x, int y, int width, int height)
+boolean DrawingDeactivated(int x, int y, int width, int height)
{
return CheckDrawingArea(x, y, width, height, gfx.draw_deactivation_mask);
}
-inline boolean DrawingOnBackground(int x, int y)
+boolean DrawingOnBackground(int x, int y)
{
return (CheckDrawingArea(x, y, 1, 1, gfx.background_bitmap_mask) &&
CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
}
-inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
- int src_x, int src_y, int width, int height,
- int dst_x, int dst_y)
+static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y,
+ int *width, int *height, boolean is_dest)
{
+#if 1
+ 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;
+
+#else
+
+ /* skip if rectangle completely outside bitmap */
+
+ if (*x + *width <= 0 ||
+ *y + *height <= 0 ||
+ *x >= bitmap->width ||
+ *y >= bitmap->height)
+ return FALSE;
+
+ /* clip if rectangle overlaps bitmap */
+
+ if (*x < 0)
+ {
+ *width += *x;
+ *x = 0;
+ }
+ else if (*x + *width > bitmap->width)
+ {
+ *width = bitmap->width - *x;
+ }
+
+ if (*y < 0)
+ {
+ *height += *y;
+ *y = 0;
+ }
+ else if (*y + *height > bitmap->height)
+ {
+ *height = bitmap->height - *y;
+ }
+
+ return TRUE;
+#endif
+}
+
+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 1
+ 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;
+
+#else
+ /* skip if rectangle starts outside bitmap */
+ if (src_x >= src_bitmap->width ||
+ src_y >= src_bitmap->height ||
+ dst_x >= dst_bitmap->width ||
+ dst_y >= dst_bitmap->height)
+ return;
+
+ /* clip if rectangle overlaps bitmap */
+ if (src_x + width > src_bitmap->width)
+ width = src_bitmap->width - src_x;
+ if (src_y + height > src_bitmap->height)
+ height = src_bitmap->height - src_y;
+ if (dst_x + width > dst_bitmap->width)
+ width = dst_bitmap->width - dst_x;
+ if (dst_y + height > dst_bitmap->height)
+ height = dst_bitmap->height - dst_y;
+#endif
+
+#if 1
+ /* !!! 2013-12-11: An "old friend" is back. Same bug in SDL2 2.0.1 !!! */
+#if 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.) */
+#if 1
+ /* !!! 2009-03-24: It seems that this problem still exists in 1.2.12 !!! */
+ //#if defined(TARGET_SDL) && defined(PLATFORM_WIN32)
+#if defined(TARGET_SDL2)
+ if (src_bitmap == dst_bitmap)
+ {
+ /* !!! THIS IS A BUG (IN THE SDL LIBRARY?) AND SHOULD BE FIXED !!! */
+
+ /* 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
+#endif
+#endif
+#endif
+
+#if 0
+ if (dst_x < gfx.sx + gfx.sxsize)
+ printf("::: %d: BlitBitmap(%d, %d, %d, %d)\n",
+ FrameCounter, dst_x, dst_y, width, height);
+#endif
+
+ sysCopyArea(src_bitmap, dst_bitmap,
+ src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE);
}
-inline void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height,
- Pixel color)
+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(Bitmap *bitmap_cross, int x, int y, int width, int height,
+ int fade_mode, int fade_delay, int post_delay,
+ void (*draw_border_function)(void))
+{
+#if 1
+ /* (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) */
+ if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE))
+ return;
+#endif
+
+ SDLFadeRectangle(bitmap_cross, x, y, width, height,
+ fade_mode, fade_delay, post_delay, draw_border_function);
+}
+
+void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height,
+ Pixel color)
{
if (DrawingDeactivated(x, y, width, height))
return;
+#if 1
+ if (!InClippedRectangle(bitmap, &x, &y, &width, &height, TRUE))
+ return;
+#else
+ /* skip if rectangle starts outside bitmap */
+ if (x >= bitmap->width ||
+ y >= bitmap->height)
+ return;
+
+ /* clip if rectangle overlaps bitmap */
+ if (x + width > bitmap->width)
+ width = bitmap->width - x;
+ if (y + height > bitmap->height)
+ height = bitmap->height - y;
+#endif
+
sysFillRectangle(bitmap, x, y, width, height, color);
}
-inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
+void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
{
FillRectangle(bitmap, x, y, width, height, BLACK_PIXEL);
}
-inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y,
- int width, int height)
+void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y,
+ int width, int height)
{
if (DrawingOnBackground(x, y))
BlitBitmap(gfx.background_bitmap, bitmap, x, y, width, height, x, y);
ClearRectangle(bitmap, x, y, width, height);
}
-inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
+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
}
-inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
+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
}
-inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
- int src_x, int src_y,
- int width, int height,
- int dst_x, int dst_y)
+void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y)
{
if (DrawingDeactivated(dst_x, dst_y, width, height))
return;
dst_x, dst_y, BLIT_MASKED);
}
-inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
- int src_x, int src_y,
- int width, int height,
- int dst_x, int dst_y)
+void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y)
{
if (DrawingOnBackground(dst_x, dst_y))
{
dst_x, dst_y);
}
-inline void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y,
- int to_x, int to_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
}
-inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
- int to_x, int to_y)
+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)
-inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
- int to_x, int to_y, Pixel pixel, int line_width)
+void DrawLine(Bitmap *bitmap, int from_x, int from_y,
+ int to_x, int to_y, Pixel pixel, int line_width)
{
int x, 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
-inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
- Pixel pixel)
+void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel)
{
-#if !defined(TARGET_X11_NATIVE)
int line_width = 4;
int i;
/*
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
}
-inline Pixel GetPixel(Bitmap *bitmap, int x, int y)
+Pixel GetPixel(Bitmap *bitmap, int x, int y)
{
if (x < 0 || x >= bitmap->width ||
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
}
-inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
- unsigned int color_g, unsigned int color_b)
+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
}
-inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
+Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
{
unsigned int color_r = (color >> 16) & 0xff;
unsigned int color_g = (color >> 8) & 0xff;
}
/* execute all pending screen drawing operations */
-inline void FlushDisplay(void)
+void FlushDisplay(void)
{
-#ifndef TARGET_SDL
- XFlush(display);
-#endif
}
/* execute and wait for all pending screen drawing operations */
-inline void SyncDisplay(void)
+void SyncDisplay(void)
{
-#ifndef TARGET_SDL
- XSync(display, FALSE);
-#endif
}
-inline void KeyboardAutoRepeatOn(void)
+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);
+#endif
#else
if (display)
XAutoRepeatOn(display);
#endif
}
-inline void KeyboardAutoRepeatOff(void)
+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);
+#endif
#else
if (display)
XAutoRepeatOff(display);
#endif
}
-inline boolean PointerInWindow(DrawWindow *window)
+boolean PointerInWindow(DrawWindow *window)
{
#if defined(TARGET_SDL)
return TRUE;
#endif
}
-inline boolean SetVideoMode(boolean fullscreen)
+boolean SetVideoMode(boolean fullscreen)
{
-#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;
- }
-
- return success;
-#endif
}
-inline boolean ChangeVideoModeIfNeeded(boolean fullscreen)
+boolean ChangeVideoModeIfNeeded(boolean fullscreen)
{
#if defined(TARGET_SDL)
if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)||
{
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);
return;
}
- if (strcmp(filename, bitmap->source_filename) == 0)
+ if (strEqual(filename, bitmap->source_filename))
{
/* The old and new image are the same (have the same filename and path).
This usually means that this image does not exist in this graphic set
Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
{
+#if 0
+ // !!! TEST ONLY !!!
+
Bitmap *dst_bitmap = CreateBitmap(zoom_width, zoom_height, DEFAULT_DEPTH);
+ print_timestamp_time("CreateBitmap");
+
+ SDL_Rect src_rect, dst_rect;
+
+ src_rect.x = 0;
+ src_rect.y = 0;
+ src_rect.w = src_bitmap->width - 0;
+ src_rect.h = src_bitmap->height;
+
+ dst_rect.x = 0;
+ dst_rect.y = 0;
+ dst_rect.w = dst_bitmap->width;
+ dst_rect.h = dst_bitmap->height;
+
+ SDL_BlitScaled(src_bitmap->surface, &src_rect,
+ dst_bitmap->surface, &dst_rect);
+ print_timestamp_time("SDL_BlitScaled");
-#if defined(TARGET_SDL)
- SDLZoomBitmap(src_bitmap, dst_bitmap);
#else
- X11ZoomBitmap(src_bitmap, dst_bitmap);
+
+ Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
#endif
return dst_bitmap;
}
-void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor)
+static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
+ int tile_size, boolean create_small_bitmaps)
{
Bitmap swap_bitmap;
- Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_8;
- int width_1, height_1, width_2, height_2, width_8, height_8;
+ Bitmap *new_bitmap;
+ 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;
+#if 1
+ int width_32, height_32;
+#endif
+ int old_width, old_height;
int new_width, new_height;
- width_1 = old_bitmap->width * zoom_factor;
- height_1 = old_bitmap->height * zoom_factor;
- width_2 = width_1 / 2;
- height_2 = height_1 / 2;
- width_8 = width_1 / 8;
- height_8 = height_1 / 8;
+ print_timestamp_init("CreateScaledBitmaps");
- /* get image with normal size (this might require scaling up) */
+ old_width = old_bitmap->width;
+ old_height = old_bitmap->height;
+
+#if 1
+ /* 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_final = ZoomBitmap(old_bitmap, width_final, height_final);
+ else
+ tmp_bitmap_final = old_bitmap;
+
+#else
+
+ /* calculate new image dimensions for final image size */
+ width_1 = old_width * zoom_factor;
+ height_1 = 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);
else
tmp_bitmap_1 = old_bitmap;
+#endif
- /* 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
- tmp_bitmap_2 = old_bitmap;
+ 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_1, width_1 / 8, height_1 / 8);
- else
- tmp_bitmap_8 = old_bitmap;
+ width_0 = width_1 = width_final;
+ height_0 = height_1 = height_final;
- /* if image was scaled up, create new clipmask for normal size image */
- if (zoom_factor != 1)
+ tmp_bitmap_0 = tmp_bitmap_1 = tmp_bitmap_final;
+
+#if 1
+ 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
+ {
+#if 0
+ if (old_width != width_0)
+ printf("::: %d, %d -> %d, %d\n",
+ old_width, old_height, width_0, height_0);
+#endif
+
+ 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();
+ }
+ }
+#endif
+
+ if (create_small_bitmaps)
{
-#if defined(TARGET_X11)
- if (old_bitmap->clip_mask)
- XFreePixmap(display, old_bitmap->clip_mask);
+ /* calculate new image dimensions for small images */
+ width_2 = width_1 / 2;
+ height_2 = height_1 / 2;
+ width_4 = width_1 / 4;
+ height_4 = height_1 / 4;
+ width_8 = width_1 / 8;
+ height_8 = height_1 / 8;
+ width_16 = width_1 / 16;
+ height_16 = height_1 / 16;
+#if 1
+ width_32 = width_1 / 32;
+ height_32 = height_1 / 32;
+#endif
+
+#if 1
+ /* get image with 1/2 of normal size (for use in the level editor) */
+ 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 (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 (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 (width_16 == old_width)
+ tmp_bitmap_16 = old_bitmap;
+ else
+ tmp_bitmap_16 = ZoomBitmap(tmp_bitmap_8, width_16, height_16);
- old_bitmap->clip_mask =
- Pixmap_to_Mask(tmp_bitmap_1->drawable, width_1, height_1);
+ UPDATE_BUSY_STATE();
+
+ /* get image with 1/32 of normal size (for use on the preview screen) */
+ 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();
- XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask);
#else
+
+ /* 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
+ tmp_bitmap_2 = old_bitmap;
+
+ 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
+ tmp_bitmap_4 = old_bitmap;
+
+ 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
+ tmp_bitmap_8 = old_bitmap;
+
+ 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
+ tmp_bitmap_16 = old_bitmap;
+
+ 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
+ tmp_bitmap_32 = old_bitmap;
+
+ UPDATE_BUSY_STATE();
+#endif
+ }
+
+#if 0
+ /* if image was scaled up, create new clipmask for normal size image */
+ if (zoom_factor != 1)
+ {
SDL_Surface *tmp_surface_1 = tmp_bitmap_1->surface;
if (old_bitmap->surface_masked)
SDL_FreeSurface(old_bitmap->surface_masked);
- SDL_SetColorKey(tmp_surface_1, SDL_SRCCOLORKEY,
+ SDL_SetColorKey(tmp_surface_1, SET_TRANSPARENT_PIXEL,
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 */
+ SDL_SetColorKey(tmp_surface_1, UNSET_TRANSPARENT_PIXEL, 0);
+ }
+#endif
+
+ if (create_small_bitmaps)
+ {
+ new_width = width_1;
+ new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */
+
+#if 1
+ if (width_0 != width_1)
+ {
+ new_width += width_0;
+ new_height = MAX(new_height, height_0);
+ }
+#endif
+
+ new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
+
+#if 1
+ if (width_0 != width_1)
+ BlitBitmap(tmp_bitmap_0, new_bitmap, 0, 0, width_0, height_0, width_1, 0);
#endif
+
+ 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);
+
+ UPDATE_BUSY_STATE();
}
+ else
+ {
+ new_width = width_1;
+ new_height = height_1;
- new_width = width_1;
- new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */
+ new_bitmap = tmp_bitmap_1; /* directly use tmp_bitmap_1 as new bitmap */
+ }
- new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
+ if (create_small_bitmaps)
+ {
+ /* if no small bitmaps created, tmp_bitmap_1 is used as new bitmap now */
- 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_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
- 3 * width_1 / 4, height_1);
+#if 1
+ if (tmp_bitmap_final != old_bitmap)
+ FreeBitmap(tmp_bitmap_final);
- if (zoom_factor != 1)
- FreeBitmap(tmp_bitmap_1);
+ if (tmp_bitmap_0 != old_bitmap &&
+ tmp_bitmap_0 != tmp_bitmap_final)
+ FreeBitmap(tmp_bitmap_0);
+
+ if (tmp_bitmap_1 != old_bitmap &&
+ tmp_bitmap_1 != tmp_bitmap_final &&
+ tmp_bitmap_1 != tmp_bitmap_0)
+ FreeBitmap(tmp_bitmap_1);
- if (zoom_factor != 2)
- FreeBitmap(tmp_bitmap_2);
+ if (tmp_bitmap_2 != old_bitmap)
+ FreeBitmap(tmp_bitmap_2);
- if (zoom_factor != 8)
- FreeBitmap(tmp_bitmap_8);
+ if (tmp_bitmap_4 != old_bitmap)
+ FreeBitmap(tmp_bitmap_4);
- /* replace image with extended image (containing normal, 1/2 and 1/8 size) */
+ if (tmp_bitmap_8 != old_bitmap)
+ FreeBitmap(tmp_bitmap_8);
+
+ if (tmp_bitmap_16 != old_bitmap)
+ FreeBitmap(tmp_bitmap_16);
+
+ if (tmp_bitmap_32 != old_bitmap)
+ FreeBitmap(tmp_bitmap_32);
+
+#else
+
+ 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);
+#endif
+ }
+
+ /* 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;
old_bitmap->width = new_bitmap->width;
old_bitmap->height = new_bitmap->height;
- FreeBitmap(new_bitmap);
+#if 1
+ /* this replaces all blit masks created when loading -- maybe optimize this */
+ {
+ SDL_Surface *old_surface = old_bitmap->surface;
+
+ if (old_bitmap->surface_masked)
+ SDL_FreeSurface(old_bitmap->surface_masked);
+
+ SDL_SetColorKey(old_surface, SET_TRANSPARENT_PIXEL,
+ SDL_MapRGB(old_surface->format, 0x00, 0x00, 0x00));
+
+#if 1
+ if ((old_bitmap->surface_masked = SDLGetNativeSurface(old_surface)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+#else
+ if ((old_bitmap->surface_masked = SDL_DisplayFormat(old_surface)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+#endif
+
+ SDL_SetColorKey(old_surface, UNSET_TRANSPARENT_PIXEL, 0);
+ }
+#endif
+
+ UPDATE_BUSY_STATE();
+
+ FreeBitmap(new_bitmap); /* this actually frees the _old_ bitmap now */
+
+ print_timestamp_done("CreateScaledBitmaps");
+}
+
+void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor,
+ int tile_size)
+{
+ CreateScaledBitmaps(old_bitmap, zoom_factor, tile_size, TRUE);
+}
+
+void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
+{
+ CreateScaledBitmaps(old_bitmap, zoom_factor, 0, FALSE);
}
/* mouse pointer functions */
/* ------------------------------------------------------------------------- */
-#if !defined(PLATFORM_MSDOS)
-/* XPM */
-static const char *cursor_image_playfield[] =
+#define USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER 0
+
+/* XPM image definitions */
+static const char *cursor_image_none[] =
{
/* width height num_colors chars_per_pixel */
" 16 16 3 1",
". c #ffffff",
" c None",
-#if 1
- /* some people complained about a "white dot" on the screen and thought it
- was a graphical error... OK, let's just remove the whole pointer :-) */
-
/* pixels */
" ",
" ",
/* hot spot */
"0,0"
+};
-#else
+#if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER
+static const char *cursor_image_dot[] =
+{
+ /* width height num_colors chars_per_pixel */
+ " 16 16 3 1",
+
+ /* colors */
+ "X c #000000",
+ ". c #ffffff",
+ " c None",
/* pixels */
" X ",
/* hot spot */
"1,1"
-#endif
};
+static const char **cursor_image_playfield = cursor_image_dot;
+#else
+/* some people complained about a "white dot" on the screen and thought it
+ was a graphical error... OK, let's just remove the whole pointer :-) */
+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)
{
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;
+
+ if (cursor_none == NULL)
+ cursor_none = get_cursor_from_image(cursor_image_none);
if (cursor_playfield == NULL)
cursor_playfield = get_cursor_from_image(cursor_image_playfield);
-#if defined(TARGET_SDL)
- SDLSetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
-#elif defined(TARGET_X11_NATIVE)
- X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
-#endif
-#endif
+ cursor_new = (mode == CURSOR_DEFAULT ? NULL :
+ mode == CURSOR_NONE ? cursor_none :
+ mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
+
+ SDLSetMouseCursor(cursor_new);
}
/* audio functions */
/* ========================================================================= */
-inline void OpenAudio(void)
+void OpenAudio(void)
{
/* always start with reliable default values */
audio.sound_available = FALSE;
#if defined(TARGET_SDL)
SDLOpenAudio();
-#elif defined(PLATFORM_UNIX)
- UnixOpenAudio();
-#elif defined(PLATFORM_MSDOS)
- MSDOSOpenAudio();
#endif
}
-inline void CloseAudio(void)
+void CloseAudio(void)
{
#if defined(TARGET_SDL)
SDLCloseAudio();
-#elif defined(PLATFORM_UNIX)
- UnixCloseAudio();
-#elif defined(PLATFORM_MSDOS)
- MSDOSCloseAudio();
#endif
audio.sound_enabled = FALSE;
}
-inline void SetAudioMode(boolean enabled)
+void SetAudioMode(boolean enabled)
{
if (!audio.sound_available)
return;
/* event functions */
/* ========================================================================= */
-inline void InitEventFilter(EventFilter filter_function)
+void InitEventFilter(EventFilter filter_function)
{
-#if defined(TARGET_SDL)
/* set event filter to filter out certain events */
+#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+ SDL_SetEventFilter(filter_function, NULL);
+#else
SDL_SetEventFilter(filter_function);
#endif
+#endif
}
-inline boolean PendingEvent(void)
+boolean PendingEvent(void)
{
#if defined(TARGET_SDL)
return (SDL_PollEvent(NULL) ? TRUE : FALSE);
#endif
}
-inline void NextEvent(Event *event)
+void NextEvent(Event *event)
{
#if defined(TARGET_SDL)
SDLNextEvent(event);
#endif
}
-inline void PeekEvent(Event *event)
+void PeekEvent(Event *event)
{
#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+ SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+#else
SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS);
+#endif
#else
XPeekEvent(display, event);
#endif
}
-inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
+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
printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n",
else
return event->keysym.sym;
+#endif
#else
#if 0
#endif
}
-inline KeyMod HandleKeyModState(Key key, int key_status)
+KeyMod HandleKeyModState(Key key, int key_status)
{
static KeyMod current_modifiers = KMOD_None;
-#if !defined(TARGET_SDL)
if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */
{
KeyMod new_modifier = KMOD_None;
else
current_modifiers &= ~new_modifier;
}
-#endif
return current_modifiers;
}
-inline KeyMod GetKeyModState()
+KeyMod GetKeyModState()
{
#if defined(TARGET_SDL)
return (KeyMod)SDL_GetModState();
#endif
}
-inline boolean CheckCloseWindowEvent(ClientMessageEvent *event)
+KeyMod GetKeyModStateFromEvents()
+{
+ /* always use key modifier state as tracked from key events (this is needed
+ if the modifier key event was injected into the event queue, but the key
+ was not really pressed on keyboard -- SDL_GetModState() seems to directly
+ query the keys as held pressed on the keyboard) -- this case is currently
+ only used to filter out clipboard insert events from "True X-Mouse" tool */
+
+ return HandleKeyModState(KSYM_UNDEFINED, 0);
+}
+
+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;
/* joystick functions */
/* ========================================================================= */
-inline void InitJoysticks()
+void InitJoysticks()
{
int i;
#if defined(TARGET_SDL)
SDLInitJoysticks();
-#elif defined(PLATFORM_UNIX)
- UnixInitJoysticks();
-#elif defined(PLATFORM_MSDOS)
- MSDOSInitJoysticks();
#endif
#if 0
#endif
}
-inline boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
+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
}
projects / rocksndiamonds.git / blobdiff