X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=1c33deb66375d930e42c891f98017114e73cffcc;hb=74c0f7de91268e40d15948f473eac51a9760b9c0;hp=18776bd423a17d02bd5e6396a81f70883a09e9c9;hpb=608be3bcd270eb45628a274eddb6dbcc8940accf;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 18776bd4..1c33deb6 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;
@@ -120,7 +120,7 @@ void InitPlatformDependantStuff(void)
 #endif
 }
 
-void ClosePlatformDependantStuff(void)
+void ClosePlatformDependentStuff(void)
 {
 #if defined(PLATFORM_MSDOS)
   dumpErrorFile();
@@ -194,9 +194,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;
@@ -559,9 +559,9 @@ inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
 {
   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;
@@ -591,7 +591,7 @@ inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
   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);
 
@@ -821,7 +821,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
   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);
 
@@ -838,9 +838,11 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
   FreeBitmap(tmp_bitmap_8);
 
 #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
@@ -855,6 +857,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap)
 /* mouse pointer functions                                                   */
 /* ------------------------------------------------------------------------- */
 
+#if !defined(PLATFORM_MSDOS)
 /* XPM */
 static const char *cursor_image_playfield[] =
 {
@@ -906,9 +909,9 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image)
   sscanf(image[0], " %d %d ", &cursor->width, &cursor->height);
 
   i = -1;
-  for (y=0; y < cursor->width; y++)
+  for (y = 0; y < cursor->width; y++)
   {
-    for (x=0; x < cursor->height; x++)
+    for (x = 0; x < cursor->height; x++)
     {
       int bit_nr = x % 8;
       int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr );
@@ -940,9 +943,11 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image)
 
   return cursor;
 }
+#endif	/* !PLATFORM_MSDOS */
 
 void SetMouseCursor(int mode)
 {
+#if !defined(PLATFORM_MSDOS)
   static struct MouseCursorInfo *cursor_playfield = NULL;
 
   if (cursor_playfield == NULL)
@@ -953,6 +958,7 @@ void SetMouseCursor(int mode)
 #elif defined(TARGET_X11_NATIVE)
   X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
 #endif
+#endif
 }
 
 
@@ -1070,6 +1076,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)
@@ -1101,7 +1165,7 @@ inline void InitJoysticks()
 
   /* 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)