X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=93d251e9d37bb86cb74596cfe9cfc298af92b07f;hb=2b65ec99f743dde3ee41083cf89623d4d9b8740e;hp=45fb77c1e86471cc7861b27ec3af6ab88b045770;hpb=de8b3ae622eae10f1caf96872fb1790f7bd9644b;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 45fb77c1..93d251e9 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -107,7 +107,7 @@ void InitExitFunction(void (*exit_function)(int)) #endif } -void InitPlatformDependantStuff(void) +void InitPlatformDependentStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; @@ -117,10 +117,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 +196,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; @@ -370,8 +372,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; } @@ -559,9 +560,9 @@ inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, { int x, y; - for (x=0; xheight; tmp_width = src_width; - tmp_height = src_height + src_height / 2; + tmp_height = src_height + (src_height + 1) / 2; /* prevent odd height */ tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); @@ -837,12 +839,30 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) FreeBitmap(tmp_bitmap_2); FreeBitmap(tmp_bitmap_8); +#if 0 + #if defined(TARGET_SDL) + /* !!! what about the old src_bitmap->surface ??? FIX ME !!! */ src_bitmap->surface = tmp_bitmap->surface; tmp_bitmap->surface = NULL; #else + /* !!! see above !!! */ src_bitmap->drawable = tmp_bitmap->drawable; tmp_bitmap->drawable = None; +#endif + +#else + +#if defined(TARGET_SDL) + swap_bitmap.surface = src_bitmap->surface; + src_bitmap->surface = tmp_bitmap->surface; + tmp_bitmap->surface = swap_bitmap.surface; +#else + swap_bitmap.drawable = src_bitmap->drawable; + src_bitmap->drawable = tmp_bitmap->drawable; + tmp_bitmap->drawable = swap_bitmap.drawable; +#endif + #endif src_bitmap->height = tmp_bitmap->height; @@ -855,84 +875,106 @@ 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 +983,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 +1002,7 @@ void SetMouseCursor(int mode) #elif defined(TARGET_X11_NATIVE) X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); #endif +#endif } @@ -1078,6 +1120,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 +1209,7 @@ inline void InitJoysticks() /* always start with reliable default values */ joystick.status = JOYSTICK_NOT_AVAILABLE; - for (i=0; i