#endif
}
-void InitPlatformDependantStuff(void)
+void InitPlatformDependentStuff(void)
{
#if defined(PLATFORM_MSDOS)
_fmode = O_BINARY;
#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();
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;
X11FreeBitmapPointers(bitmap);
#endif
- if (bitmap->source_filename)
- free(bitmap->source_filename);
+ checked_free(bitmap->source_filename);
bitmap->source_filename = NULL;
}
{
int x, y;
- for (x=0; x<line_width; x++)
+ for (x = 0; x < line_width; x++)
{
- for (y=0; y<line_width; y++)
+ for (y = 0; y < line_width; y++)
{
int dx = x - line_width / 2;
int dy = y - line_width / 2;
int line_width = 4;
int i;
- for (i=0; i<num_points - 1; i++)
+ for (i = 0; i < num_points - 1; i++)
DrawLine(bitmap, points[i].x, points[i].y,
points[i + 1].x, points[i + 1].y, pixel, line_width);
void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
{
+ Bitmap swap_bitmap;
Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8;
int src_width, src_height;
int tmp_width, tmp_height;
src_height = src_bitmap->height;
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);
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;
/* 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 ' ':
}
}
- 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);
#elif defined(TARGET_X11_NATIVE)
X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
#endif
+#endif
}
#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)
/* always start with reliable default values */
joystick.status = JOYSTICK_NOT_AVAILABLE;
- for (i=0; i<MAX_PLAYERS; i++)
+ for (i = 0; i < MAX_PLAYERS; i++)
joystick.fd[i] = -1; /* joystick device closed */
#if defined(TARGET_SDL)