X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=94bcccdc9262eca5b8886676be68cd2228578346;hb=95ff39b11bc3c268d8206193bad1433ac9526c94;hp=45fb77c1e86471cc7861b27ec3af6ab88b045770;hpb=de8b3ae622eae10f1caf96872fb1790f7bd9644b;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 45fb77c1..94bcccdc 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" @@ -40,6 +41,7 @@ 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; @@ -74,8 +76,8 @@ void InitProgramInfo(char *argv0, 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_directory = userdata_directory; program.program_title = program_title; @@ -107,7 +109,7 @@ void InitExitFunction(void (*exit_function)(int)) #endif } -void InitPlatformDependantStuff(void) +void InitPlatformDependentStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; @@ -117,10 +119,12 @@ void InitPlatformDependantStuff(void) #if defined(TARGET_SDL) if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0) Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); + + SDLNet_Init(); #endif } -void ClosePlatformDependantStuff(void) +void ClosePlatformDependentStuff(void) { #if defined(PLATFORM_MSDOS) dumpErrorFile(); @@ -194,9 +198,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; @@ -210,27 +214,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; @@ -246,10 +230,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) @@ -370,8 +356,7 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) X11FreeBitmapPointers(bitmap); #endif - if (bitmap->source_filename) - free(bitmap->source_filename); + checked_free(bitmap->source_filename); bitmap->source_filename = NULL; } @@ -437,7 +422,7 @@ inline boolean DrawingDeactivated(int x, int y, int width, int height) inline 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)); } @@ -475,12 +460,6 @@ 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) { #if defined(TARGET_X11) @@ -489,9 +468,6 @@ inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) bitmap->clip_gc = clip_gc; XSetClipMask(display, bitmap->clip_gc, clip_pixmap); } -#if 0 - last_clip_gc = clip_gc; -#endif #endif } @@ -503,9 +479,6 @@ inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) bitmap->clip_gc = clip_gc; XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y); } -#if 0 - last_clip_gc = clip_gc; -#endif #endif } @@ -543,6 +516,16 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, dst_x, dst_y); } +inline 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) { @@ -559,9 +542,9 @@ inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, { int x, y; - for (x=0; xsource_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 @@ -811,43 +794,98 @@ Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) return dst_bitmap; } -void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) +void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor) { - Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8; - int src_width, src_height; - int tmp_width, tmp_height; + 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; + 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; - src_width = src_bitmap->width; - src_height = src_bitmap->height; + /* 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; + + /* 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; - tmp_width = src_width; - tmp_height = src_height + src_height / 2; + /* 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; + + /* 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 + } - tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); + new_width = width_1; + new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */ - tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2); - tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8); + new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH); - BlitBitmap(src_bitmap, tmp_bitmap, 0, 0, src_width, src_height, 0, 0); - BlitBitmap(tmp_bitmap_2, tmp_bitmap, 0, 0, src_width / 2, src_height / 2, - 0, src_height); - BlitBitmap(tmp_bitmap_8, tmp_bitmap, 0, 0, src_width / 8, src_height / 8, - 3 * src_width / 4, src_height); + 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); - FreeBitmap(tmp_bitmap_2); - FreeBitmap(tmp_bitmap_8); + if (zoom_factor != 1) + FreeBitmap(tmp_bitmap_1); + if (zoom_factor != 2) + FreeBitmap(tmp_bitmap_2); + + if (zoom_factor != 8) + FreeBitmap(tmp_bitmap_8); + + /* replace image with extended image (containing normal, 1/2 and 1/8 size) */ #if defined(TARGET_SDL) - src_bitmap->surface = tmp_bitmap->surface; - tmp_bitmap->surface = NULL; + swap_bitmap.surface = old_bitmap->surface; + old_bitmap->surface = new_bitmap->surface; + new_bitmap->surface = swap_bitmap.surface; #else - src_bitmap->drawable = tmp_bitmap->drawable; - tmp_bitmap->drawable = None; + swap_bitmap.drawable = old_bitmap->drawable; + old_bitmap->drawable = new_bitmap->drawable; + new_bitmap->drawable = swap_bitmap.drawable; #endif - src_bitmap->height = tmp_bitmap->height; + old_bitmap->width = new_bitmap->width; + old_bitmap->height = new_bitmap->height; - FreeBitmap(tmp_bitmap); + FreeBitmap(new_bitmap); } @@ -855,84 +893,108 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) /* mouse pointer functions */ /* ------------------------------------------------------------------------- */ -/* cursor bitmap in XPM format */ +#if !defined(PLATFORM_MSDOS) +/* XPM */ static const char *cursor_image_playfield[] = { /* width height num_colors chars_per_pixel */ - " 32 32 3 1", + " 16 16 3 1", /* colors */ "X c #000000", ". c #ffffff", " c None", - " X ", - "X.X ", - " X ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", +#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; - int row, col, i; + 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 (row=0; row<32; ++row) + for (y = 0; y < cursor->width; y++) { - for (col=0; col<32; ++col) + for (x = 0; x < cursor->height; x++) { - if (col % 8) - { - cursor->data[i] <<= 1; - cursor->mask[i] <<= 1; - } - else + 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[4+row][col]) + switch (image[header_lines + y][x]) { case 'X': - cursor->data[i] |= 0x01; - cursor->mask[i] |= 0x01; + cursor->data[i] |= bit_mask; + cursor->mask[i] |= bit_mask; break; case '.': - cursor->mask[i] |= 0x01; + cursor->mask[i] |= bit_mask; break; case ' ': @@ -941,17 +1003,16 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) } } - sscanf(image[4+row], "%d,%d", &cursor->hot_x, &cursor->hot_y); - - cursor->width = 32; - cursor->height = 32; + sscanf(image[header_lines + y], "%d,%d", &cursor->hot_x, &cursor->hot_y); return cursor; } +#endif /* !PLATFORM_MSDOS */ void SetMouseCursor(int mode) { - struct MouseCursorInfo *cursor_playfield = NULL; +#if !defined(PLATFORM_MSDOS) + static struct MouseCursorInfo *cursor_playfield = NULL; if (cursor_playfield == NULL) cursor_playfield = get_cursor_from_image(cursor_image_playfield); @@ -961,6 +1022,7 @@ void SetMouseCursor(int mode) #elif defined(TARGET_X11_NATIVE) X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); #endif +#endif } @@ -1048,9 +1110,19 @@ inline void NextEvent(Event *event) #endif } +inline void PeekEvent(Event *event) +{ +#if defined(TARGET_SDL) + SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS); +#else + XPeekEvent(display, event); +#endif +} + inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) { #if defined(TARGET_SDL) + #if 0 printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n", (int)event->keysym.unicode, @@ -1064,7 +1136,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), @@ -1078,6 +1152,64 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) #endif } +inline 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; + + 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; + } +#endif + + return current_modifiers; +} + +inline KeyMod GetKeyModState() +{ +#if defined(TARGET_SDL) + return (KeyMod)SDL_GetModState(); +#else + return HandleKeyModState(KSYM_UNDEFINED, 0); +#endif +} + inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) { if (event->type != EVENT_CLIENTMESSAGE) @@ -1109,7 +1241,7 @@ inline void InitJoysticks() /* always start with reliable default values */ joystick.status = JOYSTICK_NOT_AVAILABLE; - for (i=0; i