X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=940fd3790891bc48cd7a3a50731f9480a192a617;hb=0dd76aace99b32f0a9d11b908f40e9629785ade6;hp=cbf6e1da2fe9551137e2c827795085d4cb61e545;hpb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index cbf6e1da..940fd379 100644
--- a/src/events.c
+++ b/src/events.c
@@ -19,6 +19,7 @@
 #include "editor.h"
 #include "misc.h"
 #include "tape.h"
+#include "joystick.h"
 
 void EventLoop(void)
 {
@@ -39,8 +40,6 @@ void EventLoop(void)
 	  SleepWhileUnmapped();
 	  break;
 	case ButtonPress:
-	  HandleButtonEvent((XButtonEvent *) &event);
-	  break;
 	case ButtonRelease:
 	  HandleButtonEvent((XButtonEvent *) &event);
 	  break;
@@ -48,16 +47,12 @@ void EventLoop(void)
 	  HandleMotionEvent((XMotionEvent *) &event);
 	  break;
 	case KeyPress:
-	  HandleKeyEvent((XKeyEvent *) &event);
-	  break;
 	case KeyRelease:
 	  HandleKeyEvent((XKeyEvent *) &event);
 	  break;
 	case FocusIn:
-	  HandleFocusEvent(FOCUS_IN);
-	  break;
 	case FocusOut:
-	  HandleFocusEvent(FOCUS_OUT);
+	  HandleFocusEvent((XFocusChangeEvent *) &event);
 	  break;
 	default:
 	  break;
@@ -99,10 +94,8 @@ void ClearEventQueue()
 	key_joystick_mapping = 0;
 	break;
       case FocusIn:
-	HandleFocusEvent(FOCUS_IN);
-	break;
       case FocusOut:
-	HandleFocusEvent(FOCUS_OUT);
+	HandleFocusEvent((XFocusChangeEvent *) &event);
 	break;
       default:
 	break;
@@ -150,21 +143,30 @@ void HandleExposeEvent(XExposeEvent *event)
   int x = event->x, y = event->y;
   int width = event->width, height = event->height;
 
-  XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
-
   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;
 
+    SetDrawtoField(DRAW_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);
-    DrawLevelElement(JX,JY,EL_SPIELFIGUR);
+    DrawPlayerField();
+
+    SetDrawtoField(DRAW_DIRECT);
   }
 
+  if (soft_scrolling_on && game_status==PLAYING)
+    XCopyArea(display,fieldbuffer,backbuffer,gc,
+	      FX,FY, SXSIZE,SYSIZE,
+	      SX,SY);
+
+  XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
+
   XFlush(display);
 }
 
@@ -196,17 +198,18 @@ void HandleKeyEvent(XKeyEvent *event)
   HandleKey(key, key_status);
 }
 
-void HandleFocusEvent(int focus_status)
+void HandleFocusEvent(XFocusChangeEvent *event)
 {
   static int old_joystick_status = -1;
 
-  if (focus_status==FOCUS_OUT)
+  if (event->type == FocusOut)
   {
     XAutoRepeatOn(display);
     old_joystick_status = joystick_status;
     joystick_status = JOYSTICK_OFF;
+    key_joystick_mapping = 0;
   }
-  else
+  else if (event->type == FocusIn)
   {
     if (game_status == PLAYING)
       XAutoRepeatOff(display);
@@ -266,8 +269,9 @@ void HandleButton(int mx, int my, int button)
 }
 
 int Gamespeed = 4;
-int Movemethod = 0;
-int Movespeed[2] = { 10, 3 };
+int Movemethod = 1;
+int Movespeed[2] = { 10, 4 };
+char *Movespeed_text[2] = { "asynchron", "syncron" };
 
 void HandleKey(KeySym key, int key_status)
 {
@@ -354,9 +358,17 @@ void HandleKey(KeySym key, int key_status)
       joy |= JOY_BUTTON_1 | JOY_DOWN;
       break;
     case XK_Shift_L:		/* Linker Feuerknopf */
+    case XK_Control_L:
+    case XK_Alt_L:
+    case XK_Meta_L:
       joy |= JOY_BUTTON_1;
       break;
     case XK_Shift_R:		/* Rechter Feuerknopf */
+    case XK_Control_R:
+    case XK_Alt_R:
+    case XK_Meta_R:
+    case XK_Mode_switch:
+    case XK_Multi_key:
     case XK_B:			/* (Bombe legen) */
     case XK_b:
       joy |= JOY_BUTTON_2;
@@ -373,14 +385,22 @@ 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)
+  {
+    CloseDoor(DOOR_CLOSE_1);
+    game_status = MAINMENU;
+    DrawMainMenu();
+    return;
+  }
+
   if (key==XK_Escape && game_status!=MAINMENU)	/* quick quit to MAINMENU */
   {
     CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
@@ -451,14 +471,16 @@ void HandleKey(KeySym key, int key_status)
 	case XK_8:
 	case XK_9:
 	  Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
-	  printf("method == %d, speed == %d\n",
-		 Movemethod, Movespeed[Movemethod]);
+	  printf("method == %d, speed == %d (%s)\n",
+		 Movemethod, Movespeed[Movemethod],
+		 Movespeed_text[Movemethod]);
 	  break;
 
 	case XK_a:
 	  Movemethod = !Movemethod;
-	  printf("method == %d, speed == %d\n",
-		 Movemethod, Movespeed[Movemethod]);
+	  printf("method == %d, speed == %d (%s)\n",
+		 Movemethod, Movespeed[Movemethod],
+		 Movespeed_text[Movemethod]);
 	  break;
 
 	case XK_f:
@@ -474,7 +496,7 @@ void HandleKey(KeySym key, int key_status)
 	  printf("gamespeed == %d\n", Gamespeed);
 	  break;
 	case XK_l:
-	  Gamespeed = 10;
+	  Gamespeed = 50;
 	  printf("gamespeed == %d\n", Gamespeed);
 	  break;
 
@@ -482,12 +504,15 @@ void HandleKey(KeySym key, int key_status)
 	case XK_q:
 	  Dynamite = 1000;
 	  break;
-#endif
 
 	case XK_x:
-	  /*
+
 	  {
-	    int i,j,k, num_steps = 4, step_size = TILEX / num_steps;
+	    int i,j,k, num_steps = 16, step_size = TILEX / num_steps;
+	    static long scroll_delay=0;
+	    long scroll_delay_value = 4*4 / num_steps;
+
+	    printf("Scroll test\n");
 
 	    for(i=0;i<10;i++)
 	    {
@@ -496,26 +521,61 @@ void HandleKey(KeySym key, int key_status)
 		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);
+		  int done = 0;
+
+		  while(!done)
+		  {
+  		    if (DelayReached(&scroll_delay, scroll_delay_value))
+  		    {
+  		      XCopyArea(display,fieldbuffer,window,gc,
+  				SX+xxx,SY,
+  				SXSIZE-xxx,SYSIZE,
+  				SX,SY);
+  		      XCopyArea(display,fieldbuffer,window,gc,
+  				SX,SY,
+  				xxx,SYSIZE,
+  				SX+SXSIZE-xxx,SY);
+  
+  		      XFlush(display);
+  		      XSync(display,FALSE);
+
+		      done = 1;
+  		    }
+		    else
+		    {
+		      Delay(1000);
+		    }
+		  }
+  
+		  /*
+		  Delay(160000 / num_steps);
+		  */
+		  /*
 		  Delay(120000 / num_steps);
+		  */
 		}
 	      }
 	    }
 	  }
-	  */
+
 	  break;
 
+	case XK_y:
+	  {
+	    printf("FX = %d, FY = %d\n", FX,FY);
+
+	    XCopyArea(display,fieldbuffer,window,gc,
+		      0,0,
+		      MIN(WIN_XSIZE,FXSIZE),MIN(WIN_YSIZE,FYSIZE),
+		      0,0);
+	    XFlush(display);
+	    XSync(display,FALSE);
+	    Delay(1000000);
+	  }
+
+	  break;
+#endif
+
 	default:
 	  break;
       }
@@ -528,7 +588,7 @@ void HandleKey(KeySym key, int key_status)
 
 void HandleNoXEvent()
 {
-  if (button_status && game_status!=PLAYING)
+  if (button_status && game_status != PLAYING)
   {
     HandleButton(-1,-1,button_status);
     return;
@@ -568,6 +628,9 @@ void HandleJoystick()
   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:
@@ -577,7 +640,7 @@ void HandleJoystick()
       static long joystickmove_delay = 0;
 
       if (joystick && !button && !DelayReached(&joystickmove_delay,15))
-	break;
+	newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)
 	HandleMainMenu(0,0,dx,dy,newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
@@ -597,16 +660,6 @@ void HandleJoystick()
     {
       BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
 
-      if (tape.pausing)
-	joy = 0;
-
-      if (!joy)
-      {
-	DigField(0,0,0,0,DF_NO_PUSH);
-	SnapField(0,0);
-	break;
-      }
-
       if (GameOver && newbutton)
       {
 	CloseDoor(DOOR_CLOSE_1);
@@ -615,24 +668,59 @@ void HandleJoystick()
 	return;
       }
 
-      if (button1)
-	snapped = SnapField(dx,dy);
+      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
       {
-	if (button2)
-	  bombed = PlaceBomb();
-	moved = MoveFigure(dx,dy);
+	DigField(0,0,0,0,DF_NO_PUSH);
+	SnapField(0,0);
+	PlayerFrame = 0;
       }
 
-      if (tape.recording && (moved || snapped || bombed))
+      if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)
       {
-	if (bombed && !moved)
-	  joy &= JOY_BUTTON;
-	TapeRecordAction(joy);
-      }
-      else if (tape.playing && snapped)
-	SnapField(0,0);			/* stop snapping */
+	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;
+	    }
+	  }
+	}
+      }
       break;
     }
     default: