X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=c77567a93e8b3b97d939e545336302680248d624;hp=4f8ef0fb89a4726d8b64215b98fbb362c0bc0353;hb=643bbf5bfe5db8cf56ff57f7e835e67053bb30ff;hpb=e8b94b38c4be1bf3ada57ade9eb3a96adb080775 diff --git a/src/libgame/system.c b/src/libgame/system.c index 4f8ef0fb..c77567a9 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -69,22 +69,27 @@ int FrameCounter = 0; /* ========================================================================= */ 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 *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); - 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.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; @@ -118,7 +123,11 @@ void InitPlatformDependentStuff(void) _fmode = O_BINARY; #endif -#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS) +#if defined(PLATFORM_MACOSX) + updateUserGameDataDir(); +#endif + +#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX) openErrorFile(); #endif @@ -236,7 +245,10 @@ void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) 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); @@ -248,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) { + SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ 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); } @@ -312,20 +331,24 @@ void CloseVideoDisplay(void) #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.fullscreen_available = FULLSCREEN_STATUS; video.fullscreen_enabled = FALSE; + video.fullscreen_modes = NULL; + video.fullscreen_mode_current = NULL; #if defined(TARGET_SDL) - SDLInitVideoBuffer(backbuffer, window, fullscreen); + SDLInitVideoBuffer(&backbuffer, &window, fullscreen); #else - X11InitVideoBuffer(backbuffer, window); + X11InitVideoBuffer(&backbuffer, &window); #endif + + drawto = backbuffer; } Bitmap *CreateBitmapStruct(void) @@ -412,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_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; - 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; - 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; @@ -446,13 +472,16 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, 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) - 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 - 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 } @@ -814,8 +843,19 @@ 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; + 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; int new_width, new_height; /* calculate new image dimensions for normal sized image */ @@ -829,7 +869,11 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, tmp_bitmap_1 = old_bitmap; /* this is only needed to make compilers happy */ - tmp_bitmap_2 = tmp_bitmap_4 = tmp_bitmap_8 = NULL; + tmp_bitmap_2 = NULL; + tmp_bitmap_4 = NULL; + tmp_bitmap_8 = NULL; + tmp_bitmap_16 = NULL; + tmp_bitmap_32 = NULL; if (create_small_bitmaps) { @@ -840,6 +884,10 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, 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; + width_32 = width_1 / 32; + height_32 = height_1 / 32; /* get image with 1/2 of normal size (for use in the level editor) */ if (zoom_factor != 2) @@ -858,8 +906,21 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_4 / 2, height_4 / 2); else tmp_bitmap_8 = old_bitmap; + + /* 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; } +#if 0 /* if image was scaled up, create new clipmask for normal size image */ if (zoom_factor != 1) { @@ -884,6 +945,7 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, SDL_SetColorKey(tmp_surface_1, 0, 0); /* reset transparent pixel */ #endif } +#endif if (create_small_bitmaps) { @@ -899,6 +961,10 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, 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); } else { @@ -922,6 +988,12 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, if (zoom_factor != 8) FreeBitmap(tmp_bitmap_8); + + if (zoom_factor != 16) + FreeBitmap(tmp_bitmap_16); + + if (zoom_factor != 32) + FreeBitmap(tmp_bitmap_32); } /* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */ @@ -938,6 +1010,32 @@ static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor, old_bitmap->width = new_bitmap->width; old_bitmap->height = new_bitmap->height; +#if 1 + /* this replaces all blit masks created when loading -- maybe optimize this */ + { +#if defined(TARGET_X11) + if (old_bitmap->clip_mask) + XFreePixmap(display, old_bitmap->clip_mask); + + old_bitmap->clip_mask = + Pixmap_to_Mask(old_bitmap->drawable, new_width, new_height); + + XSetClipMask(display, old_bitmap->stored_clip_gc, old_bitmap->clip_mask); +#else + SDL_Surface *old_surface = old_bitmap->surface; + + if (old_bitmap->surface_masked) + SDL_FreeSurface(old_bitmap->surface_masked); + + SDL_SetColorKey(old_surface, SDL_SRCCOLORKEY, + SDL_MapRGB(old_surface->format, 0x00, 0x00, 0x00)); + if ((old_bitmap->surface_masked = SDL_DisplayFormat(old_surface)) ==NULL) + Error(ERR_EXIT, "SDL_DisplayFormat() failed"); + SDL_SetColorKey(old_surface, 0, 0); /* reset transparent pixel */ +#endif + } +#endif + FreeBitmap(new_bitmap); /* this actually frees the _old_ bitmap now */ } @@ -957,8 +1055,9 @@ void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor) /* ------------------------------------------------------------------------- */ #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", @@ -968,10 +1067,6 @@ static const char *cursor_image_playfield[] = ". 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 */ " ", " ", @@ -992,8 +1087,17 @@ static const char *cursor_image_playfield[] = /* 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 ", @@ -1015,8 +1119,13 @@ static const char *cursor_image_playfield[] = /* 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; @@ -1075,15 +1184,24 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) 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); + cursor_new = (mode == CURSOR_DEFAULT ? NULL : + mode == CURSOR_NONE ? cursor_none : + mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); + #if defined(TARGET_SDL) - SDLSetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); + SDLSetMouseCursor(cursor_new); #elif defined(TARGET_X11_NATIVE) - X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); + X11SetMouseCursor(cursor_new); #endif #endif } @@ -1219,7 +1337,6 @@ 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; @@ -1259,7 +1376,6 @@ KeyMod HandleKeyModState(Key key, int key_status) else current_modifiers &= ~new_modifier; } -#endif return current_modifiers; } @@ -1273,6 +1389,17 @@ KeyMod GetKeyModState() #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)