X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=264a3366832f24750ff3de0a2a9d3527ed2b9377;hp=1fbafd7818052124b5e0b17847bfc5a35f1d6258;hb=c0c5862d9ee59c70412b1c35e558101b109a8ec9;hpb=3d52a86d358f5b1a4b36b80df5d659bce1f5a3a6 diff --git a/src/libgame/system.c b/src/libgame/system.c index 1fbafd78..264a3366 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -21,6 +21,7 @@ #endif #include "system.h" +#include "image.h" #include "sound.h" #include "setup.h" #include "joystick.h" @@ -36,12 +37,11 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; -struct FontInfo font; -struct AnimInfo anim; struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; +LevelDirTree *leveldir_first_all = NULL; LevelDirTree *leveldir_first = NULL; LevelDirTree *leveldir_current = NULL; int level_nr; @@ -68,10 +68,39 @@ int FrameCounter = 0; /* init/close functions */ /* ========================================================================= */ -void InitCommandName(char *argv0) +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, + int program_version) { - program.command_basename = - (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0); + program.command_basepath = getBasePath(argv0); + program.command_basename = getBaseName(argv0); + + 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.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.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.error_filename = getErrorFilename(ERROR_BASENAME); + program.error_file = stderr; } void InitExitFunction(void (*exit_function)(int)) @@ -88,64 +117,43 @@ void InitExitFunction(void (*exit_function)(int)) #endif } -void InitPlatformDependantStuff(void) +void InitPlatformDependentStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; #endif -#if !defined(PLATFORM_UNIX) - program.userdata_directory = "userdata"; +#if defined(PLATFORM_MACOSX) + updateUserGameDataDir(); #endif -#if defined(PLATFORM_MSDOS) - initErrorFile(); +#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX) + openErrorFile(); #endif #if defined(TARGET_SDL) if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0) Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); -#endif -} -void ClosePlatformDependantStuff(void) -{ -#if defined(PLATFORM_MSDOS) - dumpErrorFile(); + SDLNet_Init(); #endif } -void InitProgramInfo(char *unix_userdata_directory, char *program_title, - char *window_title, char *icon_title, - char *x11_icon_filename, char *x11_iconmask_filename, - char *msdos_pointer_filename, - char *cookie_prefix, char *filename_prefix, - int program_version) +void ClosePlatformDependentStuff(void) { -#if defined(PLATFORM_UNIX) - program.userdata_directory = unix_userdata_directory; -#else - program.userdata_directory = "userdata"; +#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS) + closeErrorFile(); #endif - 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.msdos_pointer_filename = msdos_pointer_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); +#if defined(PLATFORM_MSDOS) + dumpErrorFile(); +#endif } void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, int real_sx, int real_sy, - int full_sxsize, int full_sysize) + int full_sxsize, int full_sysize, + Bitmap *field_save_buffer) { gfx.sx = sx; gfx.sy = sy; @@ -156,6 +164,8 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.full_sxsize = full_sxsize; gfx.full_sysize = full_sysize; + gfx.field_save_buffer = field_save_buffer; + gfx.background_bitmap = NULL; gfx.background_bitmap_mask = REDRAW_NONE; @@ -207,9 +217,9 @@ static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile, int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize; int x, y; - for (y=0; y < tile_ysteps; y++) + for (y = 0; y < tile_ysteps; y++) { - for (x=0; x < tile_xsteps; x++) + for (x = 0; x < tile_xsteps; x++) { int draw_x = dest_x + x * tile_xsize; int draw_y = dest_y + y * tile_ysize; @@ -223,27 +233,7 @@ static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile, void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) { - static Bitmap *main_bitmap_tile = NULL; - static Bitmap *door_bitmap_tile = NULL; - - if (mask == REDRAW_FIELD) - { - if (background_bitmap_tile == main_bitmap_tile) - return; /* main background tile has not changed */ - - main_bitmap_tile = background_bitmap_tile; - } - else if (mask == REDRAW_DOOR_1) - { - if (background_bitmap_tile == door_bitmap_tile) - return; /* main background tile has not changed */ - - door_bitmap_tile = background_bitmap_tile; - } - else /* should not happen */ - return; - - if (background_bitmap_tile) + if (background_bitmap_tile != NULL) gfx.background_bitmap_mask |= mask; else gfx.background_bitmap_mask &= ~mask; @@ -259,10 +249,12 @@ void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile, gfx.real_sx, gfx.real_sy, gfx.full_sxsize, gfx.full_sysize); - else + else if (mask == REDRAW_DOOR_1) + { DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile, gfx.dx, gfx.dy, gfx.dxsize, gfx.dysize); + } } void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile) @@ -285,7 +277,30 @@ inline static int GetRealDepth(int depth) return (depth == DEFAULT_DEPTH ? video.default_depth : depth); } -inline void InitVideoDisplay(void) +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 +} + +void InitVideoDisplay(void) { #if defined(TARGET_SDL) SDLInitVideoDisplay(); @@ -294,81 +309,55 @@ inline void InitVideoDisplay(void) #endif } -inline void CloseVideoDisplay(void) +void CloseVideoDisplay(void) { KeyboardAutoRepeatOn(); #if defined(TARGET_SDL) SDL_QuitSubSystem(SDL_INIT_VIDEO); #else - if (display) XCloseDisplay(display); #endif } -inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, - int width, int height, int depth, - boolean fullscreen) +void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, + int width, int height, int depth, boolean fullscreen) { video.width = width; video.height = height; video.depth = GetRealDepth(depth); + video.fullscreen_available = FULLSCREEN_STATUS; video.fullscreen_enabled = FALSE; + video.fullscreen_modes = NULL; + video.fullscreen_mode_current = NULL; -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLInitVideoBuffer(backbuffer, window, fullscreen); #else X11InitVideoBuffer(backbuffer, window); #endif } -inline Bitmap *CreateBitmapStruct(void) +Bitmap *CreateBitmapStruct(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return checked_calloc(sizeof(struct SDLSurfaceInfo)); #else return checked_calloc(sizeof(struct X11DrawableInfo)); #endif } -inline Bitmap *CreateBitmap(int width, int height, int depth) +Bitmap *CreateBitmap(int width, int height, int depth) { Bitmap *new_bitmap = CreateBitmapStruct(); int real_depth = GetRealDepth(depth); -#ifdef TARGET_SDL - SDL_Surface *surface_tmp, *surface_native; - - if ((surface_tmp = SDL_CreateRGBSurface(SURFACE_FLAGS, width, height, - real_depth, 0, 0, 0, 0)) - == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - if ((surface_native = SDL_DisplayFormat(surface_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); - - SDL_FreeSurface(surface_tmp); - - new_bitmap->surface = surface_native; +#if defined(TARGET_SDL) + SDLCreateBitmapContent(new_bitmap, width, height, real_depth); #else - Pixmap pixmap; - - if ((pixmap = XCreatePixmap(display, window->drawable, - width, height, real_depth)) - == None) - Error(ERR_EXIT, "cannot create pixmap"); - - new_bitmap->drawable = pixmap; - - if (window == NULL) - Error(ERR_EXIT, "Window GC needed for Bitmap -- create Window first"); - - new_bitmap->gc = window->gc; - - new_bitmap->line_gc[0] = window->line_gc[0]; - new_bitmap->line_gc[1] = window->line_gc[1]; + X11CreateBitmapContent(new_bitmap, width, height, real_depth); #endif new_bitmap->width = width; @@ -382,33 +371,13 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) if (bitmap == NULL) return; -#ifdef TARGET_SDL - if (bitmap->surface) - SDL_FreeSurface(bitmap->surface); - if (bitmap->surface_masked) - SDL_FreeSurface(bitmap->surface_masked); - bitmap->surface = NULL; - bitmap->surface_masked = NULL; +#if defined(TARGET_SDL) + SDLFreeBitmapPointers(bitmap); #else - /* The X11 version seems to have a memory leak here -- although - "XFreePixmap()" is called, the correspondig memory seems not - to be freed (according to "ps"). The SDL version apparently - does not have this problem. */ - - if (bitmap->drawable) - XFreePixmap(display, bitmap->drawable); - if (bitmap->clip_mask) - XFreePixmap(display, bitmap->clip_mask); - if (bitmap->stored_clip_gc) - XFreeGC(display, bitmap->stored_clip_gc); - /* the other GCs are only pointers to GCs used elsewhere */ - bitmap->drawable = None; - bitmap->clip_mask = None; - bitmap->stored_clip_gc = None; + X11FreeBitmapPointers(bitmap); #endif - if (bitmap->source_filename) - free(bitmap->source_filename); + checked_free(bitmap->source_filename); bitmap->source_filename = NULL; } @@ -423,7 +392,7 @@ inline static void TransferBitmapPointers(Bitmap *src_bitmap, *dst_bitmap = *src_bitmap; } -inline void FreeBitmap(Bitmap *bitmap) +void FreeBitmap(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -433,9 +402,9 @@ inline void FreeBitmap(Bitmap *bitmap) free(bitmap); } -inline void CloseWindow(DrawWindow *window) +void CloseWindow(DrawWindow *window) { -#ifdef TARGET_X11 +#if defined(TARGET_X11) if (window->drawable) { XUnmapWindow(display, window->drawable); @@ -446,7 +415,7 @@ inline void CloseWindow(DrawWindow *window) #endif } -static inline boolean CheckDrawingArea(int x, int y, int width, int height, +inline static boolean CheckDrawingArea(int x, int y, int width, int height, int draw_mask) { if (draw_mask == REDRAW_NONE) @@ -467,48 +436,56 @@ static inline boolean CheckDrawingArea(int x, int y, int width, int height, 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 ((gfx.draw_background_mask & gfx.background_bitmap_mask) && + 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) +void BlitBitmap(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; -#ifdef TARGET_SDL - SDLCopyArea(src_bitmap, dst_bitmap, - src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_OPAQUE); + 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, + int fade_mode, int fade_delay, int post_delay) +{ +#if defined(TARGET_SDL) + SDLFadeRectangle(bitmap_cross, x, y, width, height, + fade_mode, fade_delay, post_delay); #else - XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable, - dst_bitmap->gc, src_x, src_y, width, height, dst_x, dst_y); + X11FadeRectangle(bitmap_cross, x, y, width, height, + fade_mode, fade_delay, post_delay); #endif } -inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) +void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height, + Pixel color) { if (DrawingDeactivated(x, y, width, height)) return; -#ifdef TARGET_SDL - SDLFillRectangle(bitmap, x, y, width, height, 0x000000); -#else - XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height); -#endif + sysFillRectangle(bitmap, x, y, width, height, color); +} + +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); @@ -516,63 +493,44 @@ inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, ClearRectangle(bitmap, x, y, width, height); } -#if 0 -#ifndef TARGET_SDL -static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */ -#endif -#endif - -inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) +void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) { -#ifdef TARGET_X11 +#if defined(TARGET_X11) if (clip_gc) { bitmap->clip_gc = clip_gc; XSetClipMask(display, bitmap->clip_gc, clip_pixmap); } -#if 0 - last_clip_gc = clip_gc; -#endif #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) { -#ifdef TARGET_X11 +#if defined(TARGET_X11) if (clip_gc) { bitmap->clip_gc = clip_gc; XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y); } -#if 0 - last_clip_gc = clip_gc; -#endif #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; -#ifdef TARGET_SDL - SDLCopyArea(src_bitmap, dst_bitmap, - src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_MASKED); -#else - XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable, - src_bitmap->clip_gc, src_x, src_y, width, height, dst_x, dst_y); -#endif + sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, + 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(src_x, src_y)) + if (DrawingOnBackground(dst_x, dst_y)) { /* draw background */ BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height, @@ -589,27 +547,35 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, dst_x, dst_y); } -inline void DrawSimpleWhiteLine(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 +} + +void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y) { -#ifdef TARGET_SDL - SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, 0xffffff); +#if defined(TARGET_SDL) + SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL); #else - XSetForeground(display, bitmap->gc, WhitePixel(display, screen)); - XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y); - XSetForeground(display, bitmap->gc, BlackPixel(display, screen)); + 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; - for (x=0; xline_gc[1], pixel); XDrawLines(display, bitmap->drawable, bitmap->line_gc[1], (XPoint *)points, num_points, CoordModeOrigin); - /* - XSetForeground(display, gc, BlackPixel(display, screen)); - */ #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 - unsigned long pixel_value; - XImage *pixel_image; - - pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1, - AllPlanes, ZPixmap); - pixel_value = XGetPixel(pixel_image, 0, 0); - - XDestroyImage(pixel_image); - - return pixel_value; + 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) { - Pixel pixel; - #if defined(TARGET_SDL) - pixel = SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); + return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); #elif defined(TARGET_ALLEGRO) - pixel = AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8); -#elif defined(TARGET_X11_NATIVE) - XColor xcolor; - - xcolor.flags = DoRed | DoGreen | DoBlue; - xcolor.red = (color_r << 8); - xcolor.green = (color_g << 8); - xcolor.blue = (color_b << 8); - XAllocColor(display, cmap, &xcolor); - pixel = xcolor.pixel; + return AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8); +#else + return X11GetPixelFromRGB(color_r, color_g, color_b); #endif - - return pixel; } -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; @@ -709,7 +655,7 @@ inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) } /* execute all pending screen drawing operations */ -inline void FlushDisplay(void) +void FlushDisplay(void) { #ifndef TARGET_SDL XFlush(display); @@ -717,16 +663,16 @@ inline void FlushDisplay(void) } /* 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) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, SDL_DEFAULT_REPEAT_INTERVAL / 2); SDL_EnableUNICODE(1); @@ -736,9 +682,9 @@ inline void KeyboardAutoRepeatOn(void) #endif } -inline void KeyboardAutoRepeatOff(void) +void KeyboardAutoRepeatOff(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableUNICODE(0); #else @@ -747,9 +693,9 @@ inline void KeyboardAutoRepeatOff(void) #endif } -inline boolean PointerInWindow(DrawWindow *window) +boolean PointerInWindow(DrawWindow *window) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return TRUE; #else Window root, child; @@ -764,9 +710,9 @@ inline boolean PointerInWindow(DrawWindow *window) #endif } -inline boolean SetVideoMode(boolean fullscreen) +boolean SetVideoMode(boolean fullscreen) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return SDLSetVideoMode(&backbuffer, fullscreen); #else boolean success = TRUE; @@ -785,9 +731,9 @@ inline boolean SetVideoMode(boolean fullscreen) #endif } -inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) +boolean ChangeVideoModeIfNeeded(boolean fullscreen) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)|| (!fullscreen && video.fullscreen_enabled)) fullscreen = SetVideoMode(fullscreen); @@ -837,7 +783,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) 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 @@ -878,12 +824,290 @@ Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) return dst_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_4,*tmp_bitmap_8; + int width_1, height_1, width_2, height_2, width_4, height_4, width_8,height_8; + int new_width, new_height; + + /* calculate new image dimensions for normal sized image */ + width_1 = old_bitmap->width * zoom_factor; + height_1 = old_bitmap->height * zoom_factor; + + /* get image with normal size (this might require scaling up) */ + if (zoom_factor != 1) + tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1); + else + tmp_bitmap_1 = old_bitmap; + + /* this is only needed to make compilers happy */ + tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL; + + 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; + + /* 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; + + /* 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) + tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2); + else + tmp_bitmap_8 = old_bitmap; + } + + /* 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); + + XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask); +#else + 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_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 + } + + 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); + } + 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); + } + + /* 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; + + FreeBitmap(new_bitmap); /* this actually frees the _old_ bitmap now */ +} + +void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor) +{ + CreateScaledBitmaps(old_bitmap, zoom_factor, TRUE); +} + +void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor) +{ + CreateScaledBitmaps(old_bitmap, zoom_factor, FALSE); +} + + +/* ------------------------------------------------------------------------- */ +/* mouse pointer functions */ +/* ------------------------------------------------------------------------- */ + +#if !defined(PLATFORM_MSDOS) +/* XPM */ +static const char *cursor_image_playfield[] = +{ + /* width height num_colors chars_per_pixel */ + " 16 16 3 1", + + /* colors */ + "X c #000000", + ". 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 + + /* pixels */ + " X ", + "X.X ", + " X ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + + /* hot spot */ + "1,1" +#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) +{ + struct MouseCursorInfo *cursor; + boolean bit_order_msb = (cursor_bit_order == BIT_ORDER_MSB); + int header_lines = 4; + int x, y, i; + + cursor = checked_calloc(sizeof(struct MouseCursorInfo)); + + sscanf(image[0], " %d %d ", &cursor->width, &cursor->height); + + i = -1; + for (y = 0; y < cursor->width; y++) + { + for (x = 0; x < cursor->height; x++) + { + int bit_nr = x % 8; + int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr ); + + if (bit_nr == 0) + { + i++; + cursor->data[i] = cursor->mask[i] = 0; + } + + switch (image[header_lines + y][x]) + { + case 'X': + cursor->data[i] |= bit_mask; + cursor->mask[i] |= bit_mask; + break; + + case '.': + cursor->mask[i] |= bit_mask; + break; + + case ' ': + break; + } + } + } + + sscanf(image[header_lines + y], "%d,%d", &cursor->hot_x, &cursor->hot_y); + + return cursor; +} +#endif /* !PLATFORM_MSDOS */ + +void SetMouseCursor(int mode) +{ +#if !defined(PLATFORM_MSDOS) + static struct MouseCursorInfo *cursor_playfield = NULL; + + 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 +} + /* ========================================================================= */ /* audio functions */ /* ========================================================================= */ -inline void OpenAudio(void) +void OpenAudio(void) { /* always start with reliable default values */ audio.sound_available = FALSE; @@ -894,7 +1118,7 @@ inline void OpenAudio(void) audio.sound_deactivated = FALSE; audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0; - audio.mixer_pid = -1; + audio.mixer_pid = 0; audio.device_name = NULL; audio.device_fd = -1; @@ -911,7 +1135,7 @@ inline void OpenAudio(void) #endif } -inline void CloseAudio(void) +void CloseAudio(void) { #if defined(TARGET_SDL) SDLCloseAudio(); @@ -924,7 +1148,7 @@ inline void CloseAudio(void) audio.sound_enabled = FALSE; } -inline void SetAudioMode(boolean enabled) +void SetAudioMode(boolean enabled) { if (!audio.sound_available) return; @@ -937,35 +1161,45 @@ inline void SetAudioMode(boolean enabled) /* event functions */ /* ========================================================================= */ -inline void InitEventFilter(EventFilter filter_function) +void InitEventFilter(EventFilter filter_function) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) /* set event filter to filter out certain events */ SDL_SetEventFilter(filter_function); #endif } -inline boolean PendingEvent(void) +boolean PendingEvent(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return (SDL_PollEvent(NULL) ? TRUE : FALSE); #else return (XPending(display) ? TRUE : FALSE); #endif } -inline void NextEvent(Event *event) +void NextEvent(Event *event) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLNextEvent(event); #else XNextEvent(display, event); #endif } -inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) +void PeekEvent(Event *event) +{ +#if defined(TARGET_SDL) + SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS); +#else + XPeekEvent(display, event); +#endif +} + +Key GetEventKey(KeyEvent *event, boolean with_modifiers) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) + #if 0 printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n", (int)event->keysym.unicode, @@ -979,7 +1213,9 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) return event->keysym.unicode; else return event->keysym.sym; + #else + #if 0 printf("with modifiers == '0x%04x', without modifiers == '0x%04x'\n", (int)XLookupKeysym(event, event->state), @@ -993,7 +1229,74 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) #endif } -inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) +KeyMod HandleKeyModState(Key key, int key_status) +{ + static KeyMod current_modifiers = KMOD_None; + + if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */ + { + KeyMod new_modifier = KMOD_None; + + switch(key) + { + case KSYM_Shift_L: + new_modifier = KMOD_Shift_L; + break; + case KSYM_Shift_R: + new_modifier = KMOD_Shift_R; + break; + case KSYM_Control_L: + new_modifier = KMOD_Control_L; + break; + case KSYM_Control_R: + new_modifier = KMOD_Control_R; + break; + case KSYM_Meta_L: + new_modifier = KMOD_Meta_L; + break; + case KSYM_Meta_R: + new_modifier = KMOD_Meta_R; + break; + case KSYM_Alt_L: + new_modifier = KMOD_Alt_L; + break; + case KSYM_Alt_R: + new_modifier = KMOD_Alt_R; + break; + default: + break; + } + + if (key_status == KEY_PRESSED) + current_modifiers |= new_modifier; + else + current_modifiers &= ~new_modifier; + } + + return current_modifiers; +} + +KeyMod GetKeyModState() +{ +#if defined(TARGET_SDL) + return (KeyMod)SDL_GetModState(); +#else + return HandleKeyModState(KSYM_UNDEFINED, 0); +#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) return FALSE; @@ -1014,17 +1317,17 @@ inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) /* joystick functions */ /* ========================================================================= */ -inline void InitJoysticks() +void InitJoysticks() { int i; -#ifdef NO_JOYSTICK +#if defined(NO_JOYSTICK) return; /* joysticks generally deactivated by compile-time directive */ #endif /* always start with reliable default values */ joystick.status = JOYSTICK_NOT_AVAILABLE; - for (i=0; i