X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=2eadeee60757b0a3e7d47ef6c30e82e30dfd9e50;hb=39ea277283e3a9c633240733d553f1f1eec66f3c;hp=976974ac58891e6b9c8db2bab1c9057e876dac75;hpb=338cfb1f6b043bdeaa0c77518b2a58b364ebc941;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 976974ac..2eadeee6 100644
--- a/src/events.c
+++ b/src/events.c
@@ -34,31 +34,22 @@ void EventLoop(void)
 
       switch(event.type)
       {
-	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;
-        case ClientMessage:
-	  HandleClientMessageEvent((XClientMessageEvent *) &event);
-	  break;
+
 	default:
+	  HandleOtherEvents(&event);
 	  break;
       }
     }
@@ -99,6 +90,32 @@ void EventLoop(void)
   }
 }
 
+void HandleOtherEvents(XEvent *event)
+{
+  switch(event->type)
+  {
+    case Expose:
+      HandleExposeEvent((XExposeEvent *) event);
+      break;
+
+    case UnmapNotify:
+      SleepWhileUnmapped();
+      break;
+
+    case FocusIn:
+    case FocusOut:
+      HandleFocusEvent((XFocusChangeEvent *) event);
+      break;
+
+    case ClientMessage:
+      HandleClientMessageEvent((XClientMessageEvent *) event);
+      break;
+
+    default:
+      break;
+  }
+}
+
 void ClearEventQueue()
 {
   while(XPending(display))
@@ -109,26 +126,16 @@ void ClearEventQueue()
 
     switch(event.type)
     {
-      case Expose:
-        HandleExposeEvent((XExposeEvent *) &event);
-	break;
-      case UnmapNotify:
-	SleepWhileUnmapped();
-	break;
       case ButtonRelease:
 	button_status = MB_RELEASED;
 	break;
+
       case KeyRelease:
 	key_joystick_mapping = 0;
 	break;
-      case FocusIn:
-      case FocusOut:
-	HandleFocusEvent((XFocusChangeEvent *) &event);
-	break;
-      case ClientMessage:
-	HandleClientMessageEvent((XClientMessageEvent *) &event);
-	break;
+
       default:
+	HandleOtherEvents(&event);
 	break;
     }
   }
@@ -148,22 +155,27 @@ void SleepWhileUnmapped()
 
     switch(event.type)
     {
-      case Expose:
-        HandleExposeEvent((XExposeEvent *) &event);
-	break;
       case ButtonRelease:
 	button_status = MB_RELEASED;
 	break;
+
       case KeyRelease:
 	key_joystick_mapping = 0;
 	break;
+
       case MapNotify:
 	window_unmapped = FALSE;
 	break;
-      case ClientMessage:
-	HandleClientMessageEvent((XClientMessageEvent *) &event);
+
+      case 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;
     }
   }
@@ -177,7 +189,7 @@ void HandleExposeEvent(XExposeEvent *event)
   int x = event->x, y = event->y;
   int width = event->width, height = event->height;
 
-  if (setup.direct_draw_on && game_status==PLAYING)
+  if (setup.direct_draw && game_status==PLAYING)
   {
     int xx,yy;
     int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
@@ -194,7 +206,7 @@ void HandleExposeEvent(XExposeEvent *event)
     SetDrawtoField(DRAW_DIRECT);
   }
 
-  if (setup.soft_scrolling_on && game_status == PLAYING)
+  if (setup.soft_scrolling && game_status == PLAYING)
   {
     int fx = FX, fy = FY;
 
@@ -313,24 +325,35 @@ void HandleButton(int mx, int my, int button)
     case MAINMENU:
       HandleMainMenu(mx,my,0,0,button);
       break;
+
     case TYPENAME:
       HandleTypeName(0,XK_Return);
       break;
+
     case CHOOSELEVEL:
       HandleChooseLevel(mx,my,0,0,button);
       break;
+
     case HALLOFFAME:
       HandleHallOfFame(button);
       break;
+
     case LEVELED:
       LevelEd(mx,my,button);
       break;
+
     case HELPSCREEN:
       HandleHelpScreen(button);
       break;
+
     case SETUP:
       HandleSetupScreen(mx,my,0,0,button);
       break;
+
+    case SETUPINPUT:
+      HandleSetupInputScreen(mx,my,0,0,button);
+      break;
+
     case PLAYING:
 
       /* --> NoXEvent() will follow */
@@ -340,6 +363,7 @@ void HandleButton(int mx, int my, int button)
       */
 
       break;
+
     default:
       break;
   }
@@ -348,6 +372,68 @@ void HandleButton(int mx, int my, int button)
 void HandleKey(KeySym key, int key_status)
 {
   int joy = 0;
+  static struct SetupKeyboardInfo custom_key;
+  static struct
+  {
+    KeySym *keysym_custom;
+    KeySym keysym_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;
+
+      for (i=0; i<6; i++)
+	if (key == *key_info[i].keysym_custom)
+	  key_action |= key_info[i].action;
+
+      if (key_status == KEY_PRESSED)
+      {
+	if (network_playing)
+	  stored_player[pnr].potential_action |= key_action;
+	else
+	  stored_player[pnr].action |= key_action;
+      }
+      else
+      {
+	if (network_playing)
+	  stored_player[pnr].potential_action &= ~key_action;
+	else
+	  stored_player[pnr].action &= ~key_action;
+      }
+    }
+  }
+  else
+  {
+    int i;
+
+    for (i=0; i<6; i++)
+      if (key == key_info[i].keysym_default)
+	joy |= key_info[i].action;
+  }
+
+
+#if 0
+
 
   /* Map cursor keys to joystick directions */
 
@@ -364,6 +450,7 @@ void HandleKey(KeySym key, int key_status)
     case XK_j:
       joy |= JOY_LEFT;
       break;
+
     case XK_Right:
 #ifdef XK_KP_Right
     case XK_KP_Right:
@@ -375,6 +462,7 @@ void HandleKey(KeySym key, int key_status)
     case XK_k:
       joy |= JOY_RIGHT;
       break;
+
     case XK_Up:
 #ifdef XK_KP_Up
     case XK_KP_Up:
@@ -386,6 +474,7 @@ void HandleKey(KeySym key, int key_status)
     case XK_i:
       joy |= JOY_UP;
       break;
+
     case XK_Down:
 #ifdef XK_KP_Down
     case XK_KP_Down:
@@ -397,54 +486,63 @@ void HandleKey(KeySym key, int key_status)
     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;
+
 #ifndef MSDOS
     case XK_S:			/* Feld entfernen */
 #endif
     case XK_s:
       joy |= JOY_BUTTON_1 | JOY_LEFT;
       break;
+
 #ifndef MSDOS
     case XK_D:
 #endif
     case XK_d:
       joy |= JOY_BUTTON_1 | JOY_RIGHT;
       break;
+
 #ifndef MSDOS
     case XK_E:
 #endif
     case XK_e:
       joy |= JOY_BUTTON_1 | JOY_UP;
       break;
+
 #ifndef MSDOS
     case XK_X:
 #endif
     case XK_x:
       joy |= JOY_BUTTON_1 | JOY_DOWN;
       break;
+
     case XK_Shift_L:		/* Linker Feuerknopf */
 #ifndef MSDOS
     case XK_Control_L:
@@ -453,6 +551,7 @@ void HandleKey(KeySym key, int key_status)
 #endif
       joy |= JOY_BUTTON_1;
       break;
+
     case XK_Shift_R:		/* Rechter Feuerknopf */
 #ifndef MSDOS
     case XK_Control_R:
@@ -465,10 +564,15 @@ void HandleKey(KeySym key, int key_status)
     case XK_b:
       joy |= JOY_BUTTON_2;
       break;
+
     default:
       break;
   }
 
+
+#endif
+
+
   if (joy)
   {
     if (key_status == KEY_PRESSED)
@@ -509,10 +613,11 @@ void HandleKey(KeySym key, int key_status)
     case TYPENAME:
       HandleTypeName(0,key);
       break;
+
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
-    {
+    case SETUPINPUT:
       switch(key)
       {
 	case XK_Return:
@@ -522,15 +627,19 @@ void HandleKey(KeySym key, int key_status)
             HandleChooseLevel(0,0,0,0,MB_MENU_CHOICE);
 	  else if (game_status==SETUP)
 	    HandleSetupScreen(0,0,0,0,MB_MENU_CHOICE);
+	  else if (game_status==SETUPINPUT)
+	    HandleSetupInputScreen(0,0,0,0,MB_MENU_CHOICE);
 	  break;
+
 	default:
 	  break;
       }
       break;
-    }
+
     case HELPSCREEN:
       HandleHelpScreen(MB_RELEASED);
       break;
+
     case HALLOFFAME:
       switch(key)
       {
@@ -539,13 +648,16 @@ void HandleKey(KeySym key, int key_status)
 	  DrawMainMenu();
 	  BackToFront();
 	  break;
+
 	default:
 	  break;
       }
       break;
+
     case LEVELED:
       LevelNameTyping(key);
       break;
+
     case PLAYING:
     {
       switch(key)
@@ -570,6 +682,8 @@ void HandleKey(KeySym key, int key_status)
 		 GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
 	  break;
 
+
+#if 0
 	case XK_a:
 	  if (ScrollStepSize == TILEX/8)
 	    ScrollStepSize = TILEX/4;
@@ -577,19 +691,23 @@ void HandleKey(KeySym key, int key_status)
 	    ScrollStepSize = TILEX/8;
 	  printf("ScrollStepSize == %d\n", ScrollStepSize);
 	  break;
+#endif
 
 	case XK_f:
 	  ScrollStepSize = TILEX/8;
 	  printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
 	  break;
+
 	case XK_g:
 	  ScrollStepSize = TILEX/4;
 	  printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize);
 	  break;
+
 	case XK_h:
 	  ScrollStepSize = TILEX/2;
 	  printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize);
 	  break;
+
 	case XK_l:
 	  ScrollStepSize = TILEX;
 	  printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
@@ -602,6 +720,10 @@ void HandleKey(KeySym key, int key_status)
 	  local_player->dynamite = 1000;
 	  break;
 
+
+
+#if 0
+
 	case XK_x:
 
 	  {
@@ -672,7 +794,7 @@ void HandleKey(KeySym key, int key_status)
 	  }
 	  */
 
-	  printf("direct_draw_on == %d\n", setup.direct_draw_on);
+	  printf("direct_draw == %d\n", setup.direct_draw);
 
 	  break;
 
@@ -706,6 +828,7 @@ void HandleKey(KeySym key, int key_status)
 	  }
 
 	  break;
+#endif
 #endif
 
 	default:
@@ -736,8 +859,10 @@ void HandleNoXEvent()
     case HALLOFFAME:
     case HELPSCREEN:
     case SETUP:
+    case SETUPINPUT:
       HandleJoystick();
       break;
+
     case PLAYING:
       HandleJoystick();
 
@@ -746,14 +871,40 @@ void HandleNoXEvent()
       */
 
       break;
+
     default:
       break;
   }
 }
 
+static int HandleJoystickForAllPlayers()
+{
+  int i;
+  int result = 0;
+
+  for (i=0; i<MAX_PLAYERS; i++)
+  {
+    byte joy_action = 0;
+
+    if (!setup.input[i].use_joystick)
+      continue;
+
+    joy_action = Joystick(i);
+
+    result |= joy_action;
+
+    if (network_playing)
+      stored_player[i].potential_action = joy_action;
+    else
+      stored_player[i].action = joy_action;
+  }
+
+  return result;
+}
+
 void HandleJoystick()
 {
-  int joystick	= Joystick();
+  int joystick	= HandleJoystickForAllPlayers();
   int keyboard	= key_joystick_mapping;
   int joy	= (joystick | keyboard);
   int left	= joy & JOY_LEFT;
@@ -761,7 +912,7 @@ void HandleJoystick()
   int up	= joy & JOY_UP;
   int down	= joy & JOY_DOWN;
   int button	= joy & JOY_BUTTON;
-  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);
 
@@ -770,6 +921,7 @@ void HandleJoystick()
     case MAINMENU:
     case CHOOSELEVEL:
     case SETUP:
+    case SETUPINPUT:
     {
       static long joystickmove_delay = 0;
 
@@ -782,6 +934,9 @@ void HandleJoystick()
         HandleChooseLevel(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       else if (game_status==SETUP)
 	HandleSetupScreen(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
+      else if (game_status==SETUPINPUT)
+	HandleSetupInputScreen(0,0,dx,dy,
+			       newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       break;
     }
 
@@ -805,10 +960,7 @@ void HandleJoystick()
 	return;
       }
 
-      if (tape.pausing || AllPlayersGone)
-	joy = 0;
-
-      HandleGameActions((byte)joy);
+      HandleGameActions();
       break;
 
     default: