projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070327-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 5aac42f888b26a257973d6c8b44b790e7db7163b..c99010bc9bde7fde6a77e2f7f8451fc8790f8ade 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
2
Artsoft Entertainment *
+* (c) 1994-200
6
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-69,22
+69,27
@@
int FrameCounter = 0;
/* ========================================================================= */
void InitProgramInfo(char *argv0,
/* ========================================================================= */
void InitProgramInfo(char *argv0,
- char *userdata_
directory, char *program_title
,
- char *window_title, char *icon_title,
+ 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 *x11_icon_filename, char *x11_iconmask_filename,
- char *msdos_cursor_filename,
+ char *
sdl_icon_filename, char *
msdos_cursor_filename,
char *cookie_prefix, char *filename_prefix,
int program_version)
{
program.command_basepath = getBasePath(argv0);
program.command_basename = getBaseName(argv0);
char *cookie_prefix, char *filename_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.icon_title = icon_title;
program.program_title = program_title;
program.window_title = window_title;
program.icon_title = icon_title;
+
program.x11_icon_filename = x11_icon_filename;
program.x11_iconmask_filename = x11_iconmask_filename;
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.cookie_prefix = cookie_prefix;
program.msdos_cursor_filename = msdos_cursor_filename;
program.cookie_prefix = cookie_prefix;
@@
-95,6
+100,7
@@
void InitProgramInfo(char *argv0,
program.version_patch = VERSION_PATCH(program_version);
program.error_filename = getErrorFilename(ERROR_BASENAME);
program.version_patch = VERSION_PATCH(program_version);
program.error_filename = getErrorFilename(ERROR_BASENAME);
+ program.error_file = stderr;
}
void InitExitFunction(void (*exit_function)(int))
}
void InitExitFunction(void (*exit_function)(int))
@@
-117,8
+123,12
@@
void InitPlatformDependentStuff(void)
_fmode = O_BINARY;
#endif
_fmode = O_BINARY;
#endif
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
- initErrorFile();
+#if defined(PLATFORM_MACOSX)
+ updateUserGameDataDir();
+#endif
+
+#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX)
+ openErrorFile();
#endif
#if defined(TARGET_SDL)
#endif
#if defined(TARGET_SDL)
@@
-131,6
+141,10
@@
void InitPlatformDependentStuff(void)
void ClosePlatformDependentStuff(void)
{
void ClosePlatformDependentStuff(void)
{
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+ closeErrorFile();
+#endif
+
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
#endif
#if defined(PLATFORM_MSDOS)
dumpErrorFile();
#endif
@@
-231,7
+245,10
@@
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
if (background_bitmap_tile == NULL) /* empty background requested */
return;
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);
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.real_sx, gfx.real_sy,
gfx.full_sxsize, gfx.full_sysize);
@@
-243,13
+260,20
@@
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
}
}
}
}
+void SetWindowBackgroundBitmap(Bitmap *background_bitmap_tile)
+{
+ SetBackgroundBitmap(background_bitmap_tile, REDRAW_ALL);
+}
+
void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile)
{
void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile)
{
+ SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */
SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD);
}
void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile)
{
SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD);
}
void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile)
{
+ SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */
SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1);
}
SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1);
}
@@
-307,20
+331,24
@@
void CloseVideoDisplay(void)
#endif
}
#endif
}
-void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
- int width, int height, int depth, boolean fullscreen)
+void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
{
video.width = width;
video.height = height;
video.depth = GetRealDepth(depth);
{
video.width = width;
video.height = height;
video.depth = GetRealDepth(depth);
+
video.fullscreen_available = FULLSCREEN_STATUS;
video.fullscreen_enabled = FALSE;
video.fullscreen_available = FULLSCREEN_STATUS;
video.fullscreen_enabled = FALSE;
+ video.fullscreen_modes = NULL;
+ video.fullscreen_mode_current = NULL;
#if defined(TARGET_SDL)
#if defined(TARGET_SDL)
- SDLInitVideoBuffer(
backbuffer,
window, fullscreen);
+ SDLInitVideoBuffer(
&backbuffer, &
window, fullscreen);
#else
#else
- X11InitVideoBuffer(
backbuffer,
window);
+ X11InitVideoBuffer(
&backbuffer, &
window);
#endif
#endif
+
+ drawto = backbuffer;
}
Bitmap *CreateBitmapStruct(void)
}
Bitmap *CreateBitmapStruct(void)
@@
-407,13
+435,16
@@
inline static boolean CheckDrawingArea(int x, int y, int width, int height,
if (draw_mask & REDRAW_ALL)
return TRUE;
if (draw_mask & REDRAW_ALL)
return TRUE;
- if ((draw_mask & REDRAW_FIELD) && x < gfx.real_sx + gfx.full_sxsize)
+ if ((draw_mask & REDRAW_FIELD) &&
+ x >= gfx.real_sx && x < gfx.real_sx + gfx.full_sxsize)
return TRUE;
return TRUE;
- if ((draw_mask & REDRAW_DOOR_1) && x >= gfx.dx && y < gfx.dy + gfx.dysize)
+ if ((draw_mask & REDRAW_DOOR_1) &&
+ x >= gfx.dx && y < gfx.dy + gfx.dysize)
return TRUE;
return TRUE;
- if ((draw_mask & REDRAW_DOOR_2) && x >= gfx.dx && y >= gfx.vy)
+ if ((draw_mask & REDRAW_DOOR_2) &&
+ x >= gfx.dx && y >= gfx.vy)
return TRUE;
return FALSE;
return TRUE;
return FALSE;
@@
-441,13
+472,16
@@
void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
dst_x, dst_y, BLIT_OPAQUE);
}
dst_x, dst_y, BLIT_OPAQUE);
}
-void FadeScreen(Bitmap *bitmap_cross, int fade_mode, int fade_delay,
- int post_delay)
+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 defined(TARGET_SDL)
{
#if defined(TARGET_SDL)
- SDLFadeScreen(bitmap_cross, fade_mode, fade_delay, post_delay);
+ SDLFadeRectangle(bitmap_cross, x, y, width, height,
+ fade_mode, fade_delay, post_delay, draw_border_function);
#else
#else
- X11FadeScreen(bitmap_cross, fade_mode, fade_delay, post_delay);
+ X11FadeRectangle(bitmap_cross, x, y, width, height,
+ fade_mode, fade_delay, post_delay, draw_border_function);
#endif
}
#endif
}
@@
-805,12
+839,30
@@
Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
return dst_bitmap;
}
return dst_bitmap;
}
+#define MORE_ZOOM 1
+
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
boolean create_small_bitmaps)
{
Bitmap swap_bitmap;
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
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;
+#if MORE_ZOOM
+ 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;
+ 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;
+#else
+ Bitmap *new_bitmap, *tmp_bitmap_1, *tmp_bitmap_2, *tmp_bitmap_4,*tmp_bitmap_8;
+ int width_1, height_1, width_2, height_2, width_4, height_4, width_8,height_8;
+#endif
int new_width, new_height;
/* calculate new image dimensions for normal sized image */
int new_width, new_height;
/* calculate new image dimensions for normal sized image */
@@
-824,15
+876,28
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
tmp_bitmap_1 = old_bitmap;
/* this is only needed to make compilers happy */
tmp_bitmap_1 = old_bitmap;
/* this is only needed to make compilers happy */
- tmp_bitmap_2 = tmp_bitmap_8 = NULL;
+#if MORE_ZOOM
+ tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = tmp_bitmap_16 = NULL;
+ tmp_bitmap_32 = NULL;
+#else
+ tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL;
+#endif
if (create_small_bitmaps)
{
/* calculate new image dimensions for small images */
width_2 = width_1 / 2;
height_2 = height_1 / 2;
if (create_small_bitmaps)
{
/* 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_8 = width_1 / 8;
height_8 = height_1 / 8;
+#if MORE_ZOOM
+ width_16 = width_1 / 16;
+ height_16 = height_1 / 16;
+ width_32 = width_1 / 32;
+ height_32 = height_1 / 32;
+#endif
/* get image with 1/2 of normal size (for use in the level editor) */
if (zoom_factor != 2)
/* get image with 1/2 of normal size (for use in the level editor) */
if (zoom_factor != 2)
@@
-840,11
+905,31
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
else
tmp_bitmap_2 = old_bitmap;
else
tmp_bitmap_2 = old_bitmap;
+ /* 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;
+
/* get image with 1/8 of normal size (for use on the preview screen) */
if (zoom_factor != 8)
/* 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
);
+ tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_
4, width_4 / 2, height_4 / 2
);
else
tmp_bitmap_8 = old_bitmap;
else
tmp_bitmap_8 = old_bitmap;
+
+#if MORE_ZOOM
+ /* 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;
+
+ /* 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;
+#endif
}
/* if image was scaled up, create new clipmask for normal size image */
}
/* if image was scaled up, create new clipmask for normal size image */
@@
-882,8
+967,16
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
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_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_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
3 * width_1 / 4, height_1);
+#if MORE_ZOOM
+ 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);
+#endif
}
else
{
}
else
{
@@
-902,11
+995,21
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
if (zoom_factor != 2)
FreeBitmap(tmp_bitmap_2);
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 != 8)
FreeBitmap(tmp_bitmap_8);
+
+#if MORE_ZOOM
+ if (zoom_factor != 16)
+ FreeBitmap(tmp_bitmap_16);
+ if (zoom_factor != 32)
+ FreeBitmap(tmp_bitmap_32);
+#endif
}
}
- /* replace image with extended image (containing
normal, 1/2 and
1/8 size) */
+ /* 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;
#if defined(TARGET_SDL)
swap_bitmap.surface = old_bitmap->surface;
old_bitmap->surface = new_bitmap->surface;
@@
-939,8
+1042,9
@@
void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
/* ------------------------------------------------------------------------- */
#if !defined(PLATFORM_MSDOS)
/* ------------------------------------------------------------------------- */
#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",
{
/* width height num_colors chars_per_pixel */
" 16 16 3 1",
@@
-950,10
+1054,6
@@
static const char *cursor_image_playfield[] =
". c #ffffff",
" c None",
". 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 */
" ",
" ",
/* pixels */
" ",
" ",
@@
-974,8
+1074,17
@@
static const char *cursor_image_playfield[] =
/* hot spot */
"0,0"
/* hot spot */
"0,0"
+};
+#if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER
+static const char *cursor_image_dot[] =
+{
+ /* width height num_colors chars_per_pixel */
+ " 16 16 3 1",
-#else
+ /* colors */
+ "X c #000000",
+ ". c #ffffff",
+ " c None",
/* pixels */
" X ",
/* pixels */
" X ",
@@
-997,8
+1106,13
@@
static const char *cursor_image_playfield[] =
/* hot spot */
"1,1"
/* 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;
#if defined(TARGET_SDL)
static const int cursor_bit_order = BIT_ORDER_MSB;
@@
-1057,15
+1171,24
@@
static struct MouseCursorInfo *get_cursor_from_image(const char **image)
void SetMouseCursor(int mode)
{
#if !defined(PLATFORM_MSDOS)
void SetMouseCursor(int mode)
{
#if !defined(PLATFORM_MSDOS)
+ static struct MouseCursorInfo *cursor_none = NULL;
static struct MouseCursorInfo *cursor_playfield = 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 (cursor_playfield == NULL)
cursor_playfield = get_cursor_from_image(cursor_image_playfield);
+ cursor_new = (mode == CURSOR_DEFAULT ? NULL :
+ mode == CURSOR_NONE ? cursor_none :
+ mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
+
#if defined(TARGET_SDL)
#if defined(TARGET_SDL)
- SDLSetMouseCursor(
mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL
);
+ SDLSetMouseCursor(
cursor_new
);
#elif defined(TARGET_X11_NATIVE)
#elif defined(TARGET_X11_NATIVE)
- X11SetMouseCursor(
mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL
);
+ X11SetMouseCursor(
cursor_new
);
#endif
#endif
}
#endif
#endif
}
@@
-1201,7
+1324,6
@@
KeyMod HandleKeyModState(Key key, int key_status)
{
static KeyMod current_modifiers = KMOD_None;
{
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;
if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */
{
KeyMod new_modifier = KMOD_None;
@@
-1241,7
+1363,6
@@
KeyMod HandleKeyModState(Key key, int key_status)
else
current_modifiers &= ~new_modifier;
}
else
current_modifiers &= ~new_modifier;
}
-#endif
return current_modifiers;
}
return current_modifiers;
}
@@
-1255,6
+1376,17
@@
KeyMod GetKeyModState()
#endif
}
#endif
}
+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)
boolean CheckCloseWindowEvent(ClientMessageEvent *event)
{
if (event->type != EVENT_CLIENTMESSAGE)