X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=879b5396dd22f13549eb52245e15e97d1fa71db5;hp=63856e59f6480535de10aa9de2440577df04db7c;hb=066b410c0573fe64a1783116daf9d64883e9f03e;hpb=b7d31643c9c84104fb3ebef778e545928610ff65

diff --git a/src/events.c b/src/events.c
index 63856e59..879b5396 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,103 +1,176 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+* (c) 1995-2001 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  events.c                                                *
+* events.c                                                 *
 ***********************************************************/
 
+#include "libgame/libgame.h"
+
 #include "events.h"
+#include "init.h"
 #include "screens.h"
 #include "tools.h"
 #include "game.h"
 #include "editor.h"
-#include "misc.h"
+#include "files.h"
 #include "tape.h"
-#include "joystick.h"
+#include "network.h"
+
+/* values for key_status */
+#define KEY_NOT_PRESSED		FALSE
+#define KEY_RELEASED		FALSE
+#define KEY_PRESSED		TRUE
+
+
+/* event filter especially needed for SDL event filtering due to
+   delay problems with lots of mouse motion events when mouse
+   button not pressed */
+
+int FilterMouseMotionEvents(const Event *event)
+{
+  if (event->type != EVENT_MOTIONNOTIFY)
+    return 1;
+
+  /* get mouse motion events without pressed button only in level editor */
+  if (button_status == MB_RELEASED && game_status != LEVELED)
+    return 0;
+  else
+    return 1;
+}
+
+/* this is only really needed for non-SDL targets to filter unwanted events;
+   when using SDL with properly installed event filter, this function can be
+   replaced with a simple "NextEvent()" call, but it doesn't hurt either */
+
+static boolean NextValidEvent(Event *event)
+{
+  while (PendingEvent())
+  {
+    NextEvent(event);
+
+    if (FilterMouseMotionEvents(event))
+      return TRUE;
+  }
+
+  return FALSE;
+}
 
 void EventLoop(void)
 {
   while(1)
   {
-    if (XPending(display))	/* got an event */
+    if (PendingEvent())		/* got event */
     {
-      XEvent event;
+      Event event;
 
-      XNextEvent(display, &event);
-
-      switch(event.type)
+      if (NextValidEvent(&event))
       {
-	case Expose:
-	  HandleExposeEvent((XExposeEvent *) &event);
-	  break;
-	case UnmapNotify:
-	  SleepWhileUnmapped();
-	  break;
-	case ButtonPress:
-	case ButtonRelease:
-	  HandleButtonEvent((XButtonEvent *) &event);
-	  break;
-	case MotionNotify:
-	  HandleMotionEvent((XMotionEvent *) &event);
-	  break;
-	case KeyPress:
-	case KeyRelease:
-	  HandleKeyEvent((XKeyEvent *) &event);
-	  break;
-	case FocusIn:
-	case FocusOut:
-	  HandleFocusEvent((XFocusChangeEvent *) &event);
-	  break;
-	default:
-	  break;
+  	switch(event.type)
+  	{
+  	  case EVENT_BUTTONPRESS:
+  	  case EVENT_BUTTONRELEASE:
+  	    HandleButtonEvent((ButtonEvent *) &event);
+  	    break;
+  
+  	  case EVENT_MOTIONNOTIFY:
+  	    HandleMotionEvent((MotionEvent *) &event);
+  	    break;
+  
+  	  case EVENT_KEYPRESS:
+  	  case EVENT_KEYRELEASE:
+  	    HandleKeyEvent((KeyEvent *) &event);
+  	    break;
+  
+  	  default:
+  	    HandleOtherEvents(&event);
+  	    break;
+  	}
       }
     }
-    else			/* got no event, but don't be lazy... */
+    else
+      HandleNoEvent();
+
+    /* don't use all CPU time when idle; the main loop while playing
+       has its own synchronization and is CPU friendly, too */
+
+    if (game_status == PLAYING)
+      HandleGameActions();
+    else
     {
-      HandleNoXEvent();
-      Delay(10000);		/* don't use all CPU time when idle */
+      SyncDisplay();
+      if (!PendingEvent())	/* delay only if no pending events */
+	Delay(10);
     }
 
-    XSync(display,FALSE);
+    /* refresh window contents from drawing buffer, if needed */
+    BackToFront();
 
-    if (game_status==EXITGAME)
+    if (game_status == EXITGAME)
       return;
   }
 }
 
+void HandleOtherEvents(Event *event)
+{
+  switch(event->type)
+  {
+    case EVENT_EXPOSE:
+      HandleExposeEvent((ExposeEvent *) event);
+      break;
+
+    case EVENT_UNMAPNOTIFY:
+      SleepWhileUnmapped();
+      break;
+
+    case EVENT_FOCUSIN:
+    case EVENT_FOCUSOUT:
+      HandleFocusEvent((FocusChangeEvent *) event);
+      break;
+
+    case EVENT_CLIENTMESSAGE:
+      HandleClientMessageEvent((ClientMessageEvent *) event);
+      break;
+
+#if defined(TARGET_SDL)
+    case SDL_JOYAXISMOTION:
+    case SDL_JOYBUTTONDOWN:
+    case SDL_JOYBUTTONUP:
+      HandleJoystickEvent(event);
+      break;
+#endif
+
+    default:
+      break;
+  }
+}
+
 void ClearEventQueue()
 {
-  while(XPending(display))
+  while (PendingEvent())
   {
-    XEvent event;
+    Event event;
 
-    XNextEvent(display, &event);
+    NextEvent(&event);
 
     switch(event.type)
     {
-      case Expose:
-        HandleExposeEvent((XExposeEvent *) &event);
-	break;
-      case UnmapNotify:
-	SleepWhileUnmapped();
-	break;
-      case ButtonRelease:
+      case EVENT_BUTTONRELEASE:
 	button_status = MB_RELEASED;
 	break;
-      case KeyRelease:
+
+      case EVENT_KEYRELEASE:
 	key_joystick_mapping = 0;
 	break;
-      case FocusIn:
-      case FocusOut:
-	HandleFocusEvent((XFocusChangeEvent *) &event);
-	break;
+
       default:
+	HandleOtherEvents(&event);
 	break;
     }
   }
@@ -105,71 +178,60 @@ void ClearEventQueue()
 
 void SleepWhileUnmapped()
 {
-  BOOL window_unmapped = TRUE;
+  boolean window_unmapped = TRUE;
 
-  XAutoRepeatOn(display);
+  KeyboardAutoRepeatOn();
 
   while(window_unmapped)
   {
-    XEvent event;
+    Event event;
 
-    XNextEvent(display, &event);
+    NextEvent(&event);
 
     switch(event.type)
     {
-      case Expose:
-        HandleExposeEvent((XExposeEvent *) &event);
-	break;
-      case ButtonRelease:
+      case EVENT_BUTTONRELEASE:
 	button_status = MB_RELEASED;
 	break;
-      case KeyRelease:
+
+      case EVENT_KEYRELEASE:
 	key_joystick_mapping = 0;
 	break;
-      case MapNotify:
+
+      case EVENT_MAPNOTIFY:
 	window_unmapped = FALSE;
 	break;
+
+      case EVENT_UNMAPNOTIFY:
+	/* this is only to surely prevent the 'should not happen' case
+	 * of recursively looping between 'SleepWhileUnmapped()' and
+	 * 'HandleOtherEvents()' which usually calls this funtion.
+	 */
+	break;
+
       default:
+	HandleOtherEvents(&event);
 	break;
     }
   }
 
-  if (game_status==PLAYING)
-    XAutoRepeatOff(display);
+  if (game_status == PLAYING)
+    KeyboardAutoRepeatOff();
 }
 
-void HandleExposeEvent(XExposeEvent *event)
+void HandleExposeEvent(ExposeEvent *event)
 {
-  int x = event->x, y = event->y;
-  int width = event->width, height = event->height;
-
-  if (direct_draw_on && game_status==PLAYING)
-  {
-    int xx,yy;
-    int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
-    int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY;
-
-    drawto_field = backbuffer;
-
-    for(xx=0;xx<SCR_FIELDX;xx++)
-      for(yy=0;yy<SCR_FIELDY;yy++)
-	if (xx>=x1 && xx<=x2 && yy>=y1 && yy<=y2)
-	  DrawScreenField(xx,yy);
-    DrawPlayerField();
-
-    drawto_field = window;
-  }
-
-  XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
-
-  XFlush(display);
+#ifndef TARGET_SDL
+  RedrawPlayfield(FALSE, event->x, event->y, event->width, event->height);
+  FlushDisplay();
+#endif
 }
 
-void HandleButtonEvent(XButtonEvent *event)
+void HandleButtonEvent(ButtonEvent *event)
 {
   motion_status = FALSE;
 
-  if (event->type==ButtonPress)
+  if (event->type == EVENT_BUTTONPRESS)
     button_status = event->button;
   else
     button_status = MB_RELEASED;
@@ -177,189 +239,214 @@ void HandleButtonEvent(XButtonEvent *event)
   HandleButton(event->x, event->y, button_status);
 }
 
-void HandleMotionEvent(XMotionEvent *event)
+void HandleMotionEvent(MotionEvent *event)
 {
+  if (!PointerInWindow(window))
+    return;	/* window and pointer are on different screens */
+
+#if 1
+  if (button_status == MB_RELEASED && game_status != LEVELED)
+    return;
+#endif
+
   motion_status = TRUE;
 
   HandleButton(event->x, event->y, button_status);
 }
 
-void HandleKeyEvent(XKeyEvent *event)
+void HandleKeyEvent(KeyEvent *event)
 {
-  int key_status = (event->type == KeyPress ? KEY_PRESSED : KEY_RELEASED);
-  unsigned int event_state = (game_status != PLAYING ? event->state : 0);
-  KeySym key = XLookupKeysym(event, event_state);
+  int key_status = (event->type==EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED);
+  boolean with_modifiers = (game_status == PLAYING ? FALSE : TRUE);
+  Key key = GetEventKey(event, with_modifiers);
 
   HandleKey(key, key_status);
 }
 
-void HandleFocusEvent(XFocusChangeEvent *event)
+void HandleFocusEvent(FocusChangeEvent *event)
 {
   static int old_joystick_status = -1;
 
-  if (event->type == FocusOut)
+  if (event->type == EVENT_FOCUSOUT)
   {
-    XAutoRepeatOn(display);
-    old_joystick_status = joystick_status;
-    joystick_status = JOYSTICK_OFF;
+    int i;
+
+    KeyboardAutoRepeatOn();
+    old_joystick_status = joystick.status;
+    joystick.status = JOYSTICK_NOT_AVAILABLE;
+
+    /* simulate key release events for still pressed keys */
+    key_joystick_mapping = 0;
+    for (i=0; i<MAX_PLAYERS; i++)
+      stored_player[i].action = 0;
   }
-  else if (event->type == FocusIn)
+  else if (event->type == EVENT_FOCUSIN)
   {
+    /* When there are two Rocks'n'Diamonds windows which overlap and
+       the player moves the pointer from one game window to the other,
+       a 'FocusOut' event is generated for the window the pointer is
+       leaving and a 'FocusIn' event is generated for the window the
+       pointer is entering. In some cases, it can happen that the
+       'FocusIn' event is handled by the one game process before the
+       'FocusOut' event by the other game process. In this case the
+       X11 environment would end up with activated keyboard auto repeat,
+       because unfortunately this is a global setting and not (which
+       would be far better) set for each X11 window individually.
+       The effect would be keyboard auto repeat while playing the game
+       (game_status == PLAYING), which is not desired.
+       To avoid this special case, we just wait 1/10 second before
+       processing the 'FocusIn' event.
+    */
+
     if (game_status == PLAYING)
-      XAutoRepeatOff(display);
+    {
+      Delay(100);
+      KeyboardAutoRepeatOff();
+    }
     if (old_joystick_status != -1)
-      joystick_status = old_joystick_status;
+      joystick.status = old_joystick_status;
   }
 }
 
+void HandleClientMessageEvent(ClientMessageEvent *event)
+{
+  if (CheckCloseWindowEvent(event))
+    CloseAllAndExit(0);
+}
+
 void HandleButton(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
 
-  if (mx<0 || my<0)
+  if (button < 0)
   {
     mx = old_mx;
     my = old_my;
+    button = -button;
   }
   else
   {
     old_mx = mx;
     old_my = my;
-
-    HandleVideoButtons(mx,my,button);
-    HandleSoundButtons(mx,my,button);
-    HandleGameButtons(mx,my,button);
   }
 
+  HandleGadgets(mx, my, button);
+
   switch(game_status)
   {
     case MAINMENU:
-      HandleMainMenu(mx,my,0,0,button);
+      HandleMainMenu(mx,my, 0,0, button);
       break;
+
     case TYPENAME:
-      HandleTypeName(0,XK_Return);
+      HandleTypeName(0, KSYM_Return);
       break;
+
     case CHOOSELEVEL:
-      HandleChooseLevel(mx,my,0,0,button);
+      HandleChooseLevel(mx,my, 0,0, button);
       break;
+
     case HALLOFFAME:
-      HandleHallOfFame(button);
+      HandleHallOfFame(0,0, 0,0, button);
       break;
+
     case LEVELED:
-      LevelEd(mx,my,button);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(button);
       break;
+
     case SETUP:
-      HandleSetupScreen(mx,my,0,0,button);
+      HandleSetupScreen(mx,my, 0,0, button);
       break;
+
     case PLAYING:
-      HandleGameActions();
+#ifdef DEBUG
+      if (button == MB_RELEASED)
+      {
+	int sx = (mx - SX) / TILEX;
+	int sy = (my - SY) / TILEY;
+
+	if (IN_VIS_FIELD(sx,sy))
+	{
+	  int x = LEVELX(sx);
+	  int y = LEVELY(sy);
+
+	  printf("INFO: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
+
+	  if (!IN_LEV_FIELD(x, y))
+	    break;
+
+	  printf("      Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
+	  printf("      Store[%d][%d] == %d\n", x,y, Store[x][y]);
+	  printf("      Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
+	  printf("      StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
+	  printf("      MovPos[%d][%d] == %d\n", x,y, MovPos[x][y]);
+	  printf("      MovDir[%d][%d] == %d\n", x,y, MovDir[x][y]);
+	  printf("      MovDelay[%d][%d] == %d\n", x,y, MovDelay[x][y]);
+	  printf("\n");
+	}
+      }
+#endif
       break;
+
     default:
       break;
   }
 }
 
-int Gamespeed = 4;
-int Movemethod = 0;
-int Movespeed[2] = { 10, 3 };
-
-void HandleKey(KeySym key, int key_status)
+void HandleKey(Key key, int key_status)
 {
   int joy = 0;
+  boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive();
+  static struct SetupKeyboardInfo custom_key;
+  static struct
+  {
+    Key *key_custom;
+    Key key_default;
+    byte action;
+  } key_info[] =
+  {
+    { &custom_key.left,  DEFAULT_KEY_LEFT,  JOY_LEFT     },
+    { &custom_key.right, DEFAULT_KEY_RIGHT, JOY_RIGHT    },
+    { &custom_key.up,    DEFAULT_KEY_UP,    JOY_UP       },
+    { &custom_key.down,  DEFAULT_KEY_DOWN,  JOY_DOWN     },
+    { &custom_key.snap,  DEFAULT_KEY_SNAP,  JOY_BUTTON_1 },
+    { &custom_key.bomb,  DEFAULT_KEY_BOMB,  JOY_BUTTON_2 }
+  };
+
+  if (game_status == PLAYING)
+  {
+    int pnr;
+
+    for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+    {
+      int i;
+      byte key_action = 0;
+
+      if (setup.input[pnr].use_joystick)
+	continue;
+
+      custom_key = setup.input[pnr].key;
 
-  /* Map cursor keys to joystick directions */
+      for (i=0; i<6; i++)
+	if (key == *key_info[i].key_custom)
+	  key_action |= key_info[i].action;
 
-  switch(key)
+      if (key_status == KEY_PRESSED)
+	stored_player[pnr].action |= key_action;
+      else
+	stored_player[pnr].action &= ~key_action;
+    }
+  }
+  else
   {
-    case XK_Left:		/* normale Richtungen */
-#ifdef XK_KP_Left
-    case XK_KP_Left:
-#endif
-    case XK_KP_4:
-    case XK_J:
-    case XK_j:
-      joy |= JOY_LEFT;
-      break;
-    case XK_Right:
-#ifdef XK_KP_Right
-    case XK_KP_Right:
-#endif
-    case XK_KP_6:
-    case XK_K:
-    case XK_k:
-      joy |= JOY_RIGHT;
-      break;
-    case XK_Up:
-#ifdef XK_KP_Up
-    case XK_KP_Up:
-#endif
-    case XK_KP_8:
-    case XK_I:
-    case XK_i:
-      joy |= JOY_UP;
-      break;
-    case XK_Down:
-#ifdef XK_KP_Down
-    case XK_KP_Down:
-#endif
-    case XK_KP_2:
-    case XK_M:
-    case XK_m:
-      joy |= JOY_DOWN;
-      break;
-#ifdef XK_KP_Home
-    case XK_KP_Home:		/* Diagonalrichtungen */
-#endif
-    case XK_KP_7:
-      joy |= JOY_UP | JOY_LEFT;
-      break;
-#ifdef XK_KP_Page_Up
-    case XK_KP_Page_Up:
-#endif
-    case XK_KP_9:
-      joy = JOY_UP | JOY_RIGHT;
-      break;
-#ifdef XK_KP_End
-    case XK_KP_End:
-#endif
-    case XK_KP_1:
-      joy |= JOY_DOWN | JOY_LEFT;
-      break;
-#ifdef XK_KP_Page_Down
-    case XK_KP_Page_Down:
-#endif
-    case XK_KP_3:
-      joy |= JOY_DOWN | JOY_RIGHT;
-      break;
-    case XK_S:			/* Feld entfernen */
-    case XK_s:
-      joy |= JOY_BUTTON_1 | JOY_LEFT;
-      break;
-    case XK_D:
-    case XK_d:
-      joy |= JOY_BUTTON_1 | JOY_RIGHT;
-      break;
-    case XK_E:
-    case XK_e:
-      joy |= JOY_BUTTON_1 | JOY_UP;
-      break;
-    case XK_X:
-    case XK_x:
-      joy |= JOY_BUTTON_1 | JOY_DOWN;
-      break;
-    case XK_Shift_L:		/* Linker Feuerknopf */
-      joy |= JOY_BUTTON_1;
-      break;
-    case XK_Shift_R:		/* Rechter Feuerknopf */
-    case XK_B:			/* (Bombe legen) */
-    case XK_b:
-      joy |= JOY_BUTTON_2;
-      break;
-    default:
-      break;
+    int i;
+
+    for (i=0; i<6; i++)
+      if (key == key_info[i].key_default)
+	joy |= key_info[i].action;
   }
 
   if (joy)
@@ -370,15 +457,16 @@ void HandleKey(KeySym key, int key_status)
       key_joystick_mapping &= ~joy;
 
     HandleJoystick();
-
-    if (game_status != PLAYING)
-      key_joystick_mapping = 0;
   }
 
+  if (game_status != PLAYING)
+    key_joystick_mapping = 0;
+
   if (key_status == KEY_RELEASED)
     return;
 
-  if (key==XK_Return && game_status==PLAYING && GameOver)
+  if ((key == KSYM_Return || key == KSYM_space) &&
+      game_status == PLAYING && AllPlayersGone)
   {
     CloseDoor(DOOR_CLOSE_1);
     game_status = MAINMENU;
@@ -386,140 +474,259 @@ void HandleKey(KeySym key, int key_status)
     return;
   }
 
-  if (key==XK_Escape && game_status!=MAINMENU)	/* quick quit to MAINMENU */
+  /* allow quick escape to the main menu with the Escape key */
+  if (key == KSYM_Escape &&
+      game_status != MAINMENU &&
+      game_status != PLAYING &&
+      game_status != LEVELED &&
+      game_status != CHOOSELEVEL &&
+      game_status != SETUP)
   {
-    CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
     game_status = MAINMENU;
     DrawMainMenu();
     return;
   }
 
-  if (game_status==PLAYING && (tape.playing || tape.pausing))
+  /* special shortcuts for quick game tape saving and loading */
+  if (game_status == MAINMENU || game_status == PLAYING)
+  {
+    if (key == setup.shortcut.save_game)
+      TapeQuickSave();
+    else if (key == setup.shortcut.load_game)
+      TapeQuickLoad();
+  }
+
+
+#ifndef DEBUG
+
+  if (game_status == PLAYING && (tape.playing || tape.pausing))
     return;
 
+#endif
+
+
+
+  HandleGadgetsKeyInput(key);
+
   switch(game_status)
   {
     case TYPENAME:
-      HandleTypeName(0,key);
+      HandleTypeName(0, key);
       break;
+
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
-    {
       switch(key)
       {
-	case XK_Return:
-	  if (game_status==MAINMENU)
-	    HandleMainMenu(0,0,0,0,MB_MENU_CHOICE);
-          else if (game_status==CHOOSELEVEL)
-            HandleChooseLevel(0,0,0,0,MB_MENU_CHOICE);
-	  else if (game_status==SETUP)
-	    HandleSetupScreen(0,0,0,0,MB_MENU_CHOICE);
+	case KSYM_Return:
+	case KSYM_space:
+	  if (game_status == MAINMENU)
+	    HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
+          else if (game_status == CHOOSELEVEL)
+            HandleChooseLevel(0,0, 0,0, MB_MENU_CHOICE);
+	  else if (game_status == SETUP)
+	    HandleSetupScreen(0,0, 0,0, MB_MENU_CHOICE);
+	  break;
+
+	case KSYM_Escape:
+          if (game_status == CHOOSELEVEL)
+            HandleChooseLevel(0,0, 0,0, MB_MENU_LEAVE);
+	  else if (game_status == SETUP)
+	    HandleSetupScreen(0,0, 0,0, MB_MENU_LEAVE);
+	  break;
+
+        case KSYM_Page_Up:
+          if (game_status == CHOOSELEVEL)
+            HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
+	  break;
+
+        case KSYM_Page_Down:
+          if (game_status == CHOOSELEVEL)
+            HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
 	  break;
+
+#ifdef DEBUG
+        case KSYM_t:
+	  DumpTape(&tape);
+	  break;
+#endif
+
 	default:
 	  break;
       }
       break;
-    }
+
     case HELPSCREEN:
       HandleHelpScreen(MB_RELEASED);
       break;
+
     case HALLOFFAME:
       switch(key)
       {
-	case XK_Return:
+	case KSYM_Return:
+	case KSYM_space:
 	  game_status = MAINMENU;
 	  DrawMainMenu();
 	  BackToFront();
 	  break;
+
+        case KSYM_Page_Up:
+	  HandleHallOfFame(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
+	  break;
+
+        case KSYM_Page_Down:
+	  HandleHallOfFame(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
+	  break;
+
 	default:
 	  break;
       }
       break;
+
     case LEVELED:
-      LevelNameTyping(key);
+      if (!anyTextGadgetActiveOrJustFinished || key == KSYM_Escape)
+	HandleLevelEditorKeyInput(key);
       break;
+
     case PLAYING:
     {
       switch(key)
       {
+        case KSYM_Escape:
+	  RequestQuitGame(setup.ask_on_escape);
+	  break;
 
 #ifdef DEBUG
-	case XK_0:
-	case XK_1:
-	case XK_2:
-	case XK_3:
-	case XK_4:
-	case XK_5:
-	case XK_6:
-	case XK_7:
-	case XK_8:
-	case XK_9:
-	  Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
-	  printf("method == %d, speed == %d\n",
-		 Movemethod, Movespeed[Movemethod]);
+	case KSYM_0:
+	case KSYM_1:
+	case KSYM_2:
+	case KSYM_3:
+	case KSYM_4:
+	case KSYM_5:
+	case KSYM_6:
+	case KSYM_7:
+	case KSYM_8:
+	case KSYM_9:
+	  if (key == KSYM_0)
+	  {
+	    if (GameFrameDelay == 500)
+	      GameFrameDelay = GAME_FRAME_DELAY;
+	    else
+	      GameFrameDelay = 500;
+	  }
+	  else
+	    GameFrameDelay = (key - KSYM_0) * 10;
+	  printf("Game speed == %d%% (%d ms delay between two frames)\n",
+		 GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
 	  break;
 
-	case XK_a:
-	  Movemethod = !Movemethod;
-	  printf("method == %d, speed == %d\n",
-		 Movemethod, Movespeed[Movemethod]);
+	case KSYM_d:
+	  if (options.debug)
+	  {
+	    options.debug = FALSE;
+	    printf("debug mode disabled\n");
+	  }
+	  else
+	  {
+	    options.debug = TRUE;
+	    printf("debug mode enabled\n");
+	  }
 	  break;
 
-	case XK_f:
-	  Gamespeed = 2;
-	  printf("gamespeed == %d\n", Gamespeed);
+	case KSYM_s:
+	  if (!global.fps_slowdown)
+	  {
+	    global.fps_slowdown = TRUE;
+	    global.fps_slowdown_factor = 2;
+	    printf("fps slowdown enabled -- display only every 2nd frame\n");
+	  }
+	  else if (global.fps_slowdown_factor == 2)
+	  {
+	    global.fps_slowdown_factor = 4;
+	    printf("fps slowdown enabled -- display only every 4th frame\n");
+	  }
+	  else
+	  {
+	    global.fps_slowdown = FALSE;
+	    global.fps_slowdown_factor = 1;
+	    printf("fps slowdown disabled\n");
+	  }
+	  break;
+
+#if 0
+	case KSYM_a:
+	  if (ScrollStepSize == TILEX/8)
+	    ScrollStepSize = TILEX/4;
+	  else
+	    ScrollStepSize = TILEX/8;
+	  printf("ScrollStepSize == %d\n", ScrollStepSize);
 	  break;
-	case XK_g:
-	  Gamespeed = 3;
-	  printf("gamespeed == %d\n", Gamespeed);
+#endif
+
+#if 0
+	case KSYM_m:
+	  if (MoveSpeed == 8)
+	  {
+	    MoveSpeed = 4;
+	    ScrollStepSize = TILEX/4;
+	  }
+	  else
+	  {
+	    MoveSpeed = 8;
+	    ScrollStepSize = TILEX/8;
+	  }
+	  printf("MoveSpeed == %d\n", MoveSpeed);
 	  break;
-	case XK_h:
-	  Gamespeed = 4;
-	  printf("gamespeed == %d\n", Gamespeed);
+#endif
+
+	case KSYM_f:
+	  ScrollStepSize = TILEX/8;
+	  printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
 	  break;
-	case XK_l:
-	  Gamespeed = 10;
-	  printf("gamespeed == %d\n", Gamespeed);
+
+	case KSYM_g:
+	  ScrollStepSize = TILEX/4;
+	  printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize);
 	  break;
 
-	case XK_Q:
-	case XK_q:
-	  Dynamite = 1000;
+	case KSYM_h:
+	  ScrollStepSize = TILEX/2;
+	  printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize);
 	  break;
-#endif
 
-	case XK_x:
-	  /*
+	case KSYM_l:
+	  ScrollStepSize = TILEX;
+	  printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
+	  break;
+
+	case KSYM_Q:
+	case KSYM_q:
+	  local_player->dynamite = 1000;
+	  break;
+
+
+
+#if 0
+
+	case KSYM_z:
 	  {
-	    int i,j,k, num_steps = 4, step_size = TILEX / num_steps;
+	    int i;
 
-	    for(i=0;i<10;i++)
+	    for(i=0; i<MAX_PLAYERS; i++)
 	    {
-	      for(j=0;j<SCR_FIELDX;j++)
-	      {
-		for(k=0;k<num_steps;k++)
-		{
-		  int xxx = j*TILEX+k*step_size;
-
-		  XCopyArea(display,backbuffer,window,gc,
-			    REAL_SX+xxx,REAL_SY,
-			    FULL_SXSIZE-xxx,FULL_SYSIZE,
-			    REAL_SX,REAL_SY);
-		  XCopyArea(display,backbuffer,window,gc,
-			    REAL_SX,REAL_SY,
-			    xxx,FULL_SYSIZE,
-			    REAL_SX+FULL_SXSIZE-xxx,REAL_SY);
-
-		  XFlush(display);
-		  XSync(display,FALSE);
-		  Delay(120000 / num_steps);
-		}
-	      }
+	      printf("Player %d:\n", i);
+	      printf("  jx == %d, jy == %d\n",
+		     stored_player[i].jx, stored_player[i].jy);
+	      printf("  last_jx == %d, last_jy == %d\n",
+		     stored_player[i].last_jx, stored_player[i].last_jy);
 	    }
+	    printf("\n");
 	  }
-	  */
+
 	  break;
+#endif
+#endif
 
 	default:
 	  break;
@@ -531,60 +738,74 @@ void HandleKey(KeySym key, int key_status)
   }
 }
 
-void HandleNoXEvent()
+void HandleNoEvent()
 {
-  if (button_status && game_status!=PLAYING)
+  if (button_status && game_status != PLAYING)
   {
-    HandleButton(-1,-1,button_status);
+    HandleButton(0, 0, -button_status);
     return;
   }
 
-  switch(game_status)
+#if defined(PLATFORM_UNIX)
+  if (options.network)
+    HandleNetworking();
+#endif
+
+  HandleJoystick();
+}
+
+static int HandleJoystickForAllPlayers()
+{
+  int i;
+  int result = 0;
+
+  for (i=0; i<MAX_PLAYERS; i++)
   {
-    case MAINMENU:
-    case CHOOSELEVEL:
-    case HALLOFFAME:
-    case HELPSCREEN:
-    case SETUP:
-      HandleJoystick();
-      break;
-    case PLAYING:
-      HandleJoystick();
-      HandleGameActions();
-      break;
-    default:
-      break;
+    byte joy_action = 0;
+
+    /*
+    if (!setup.input[i].use_joystick)
+      continue;
+      */
+
+    joy_action = Joystick(i);
+    result |= joy_action;
+
+
+    if (!setup.input[i].use_joystick)
+      continue;
+
+
+    stored_player[i].action = joy_action;
   }
+
+  return result;
 }
 
 void HandleJoystick()
 {
-  int joystick	= Joystick();
+  int joystick	= HandleJoystickForAllPlayers();
   int keyboard	= key_joystick_mapping;
-  int joy	= (tape.playing ? TapePlayAction() : (joystick | keyboard));
+  int joy	= (joystick | keyboard);
   int left	= joy & JOY_LEFT;
   int right	= joy & JOY_RIGHT;
   int up	= joy & JOY_UP;
   int down	= joy & JOY_DOWN;
   int button	= joy & JOY_BUTTON;
-  int button1	= joy & JOY_BUTTON_1;
-  int button2	= joy & JOY_BUTTON_2;
-  int newbutton	= (JoystickButton() == JOY_BUTTON_NEW_PRESSED);
+  int newbutton	= (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED);
   int dx	= (left ? -1	: right ? 1	: 0);
   int dy	= (up   ? -1	: down  ? 1	: 0);
 
-  if (game_status==PLAYING && (tape.playing || keyboard))
-    newbutton = ((joy & JOY_BUTTON) != 0);
-
   switch(game_status)
   {
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
     {
-      static long joystickmove_delay = 0;
+      static unsigned long joystickmove_delay = 0;
 
-      if (joystick && !button && !DelayReached(&joystickmove_delay,15))
+      if (joystick && !button &&
+	  !DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
 	newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)
@@ -595,17 +816,20 @@ void HandleJoystick()
 	HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       break;
     }
+
     case HALLOFFAME:
-      HandleHallOfFame(!newbutton);
+      HandleHallOfFame(0,0, dx,dy, !newbutton);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(!newbutton);
       break;
+
     case PLAYING:
-    {
-      BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
+      if (tape.playing || keyboard)
+	newbutton = ((joy & JOY_BUTTON) != 0);
 
-      if (GameOver && newbutton)
+      if (AllPlayersGone && newbutton)
       {
 	CloseDoor(DOOR_CLOSE_1);
 	game_status = MAINMENU;
@@ -613,64 +837,8 @@ void HandleJoystick()
 	return;
       }
 
-      if (tape.pausing || PlayerGone)
-	joy = 0;
-
-      if (joy)
-      {
-	if (button1)
-	  snapped = SnapField(dx,dy);
-	else
-	{
-	  if (button2)
-	    bombed = PlaceBomb();
-	  moved = MoveFigure(dx,dy);
-	}
-
-	if (tape.recording && (moved || snapped || bombed))
-	{
-	  if (bombed && !moved)
-	    joy &= JOY_BUTTON;
-	  TapeRecordAction(joy);
-	}
-	else if (tape.playing && snapped)
-	  SnapField(0,0);			/* stop snapping */
-      }
-      else
-      {
-	DigField(0,0,0,0,DF_NO_PUSH);
-	SnapField(0,0);
-	PlayerFrame = 0;
-      }
-
-      if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)
-      {
-	int next_joy =
-	  tape.pos[tape.counter].joystickdata & (JOY_LEFT|JOY_RIGHT);
-
-	if (next_joy == JOY_LEFT || next_joy == JOY_RIGHT)
-	{
-	  int dx = (next_joy == JOY_LEFT ? -1 : +1);
-
-	  if (IN_LEV_FIELD(JX+dx,JY) && IS_PUSHABLE(Feld[JX+dx][JY]))
-	  {
-	    int el = Feld[JX+dx][JY];
-	    int push_delay = (IS_SB_ELEMENT(el) || el==EL_SONDE ? 2 : 10);
-
-	    if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
-	    {
-	      PlayerMovDir = next_joy;
-	      PlayerFrame = FrameCounter % 4;
-	      PlayerPushing = TRUE;
-	    }
-	  }
-	}
-      }
-
-      DrawPlayerField();
-
       break;
-    }
+
     default:
       break;
   }