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

diff --git a/src/events.c b/src/events.c
index 63856e59..69b67685 100644
--- a/src/events.c
+++ b/src/events.c
@@ -265,6 +265,7 @@ void HandleButton(int mx, int my, int button)
 int Gamespeed = 4;
 int Movemethod = 0;
 int Movespeed[2] = { 10, 3 };
+char *Movespeed_text[2] = { "asynchron", "syncron" };
 
 void HandleKey(KeySym key, int key_status)
 {
@@ -351,9 +352,15 @@ 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_B:			/* (Bombe legen) */
     case XK_b:
       joy |= JOY_BUTTON_2;
@@ -456,14 +463,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:
@@ -490,9 +499,13 @@ void HandleKey(KeySym key, int key_status)
 #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++)
 	    {
@@ -501,24 +514,43 @@ 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,backbuffer,window,gc,
+  				SX+xxx,SY,
+  				SXSIZE-xxx,SYSIZE,
+  				SX,SY);
+  		      XCopyArea(display,backbuffer,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;
 
 	default:
@@ -613,6 +645,13 @@ void HandleJoystick()
 	return;
       }
 
+
+
+      if (PlayerMovPos)
+	ScrollFigure(0);
+
+
+
       if (tape.pausing || PlayerGone)
 	joy = 0;