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

diff --git a/src/events.c b/src/events.c
index 69b67685..b563a860 100644
--- a/src/events.c
+++ b/src/events.c
@@ -61,7 +61,7 @@ void EventLoop(void)
     else			/* got no event, but don't be lazy... */
     {
       HandleNoXEvent();
-      Delay(10000);		/* don't use all CPU time when idle */
+      Delay(1000);		/* don't use all CPU time when idle */
     }
 
     XSync(display,FALSE);
@@ -149,7 +149,7 @@ void HandleExposeEvent(XExposeEvent *event)
     int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
     int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY;
 
-    drawto_field = backbuffer;
+    SetDrawtoField(DRAW_BACKBUFFER);
 
     for(xx=0;xx<SCR_FIELDX;xx++)
       for(yy=0;yy<SCR_FIELDY;yy++)
@@ -157,9 +157,14 @@ void HandleExposeEvent(XExposeEvent *event)
 	  DrawScreenField(xx,yy);
     DrawPlayerField();
 
-    drawto_field = window;
+    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);
@@ -202,6 +207,7 @@ void HandleFocusEvent(XFocusChangeEvent *event)
     XAutoRepeatOn(display);
     old_joystick_status = joystick_status;
     joystick_status = JOYSTICK_OFF;
+    key_joystick_mapping = 0;
   }
   else if (event->type == FocusIn)
   {
@@ -262,10 +268,8 @@ 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" };
+int GameSpeed = 2;
+int MoveSpeed = 8;
 
 void HandleKey(KeySym key, int key_status)
 {
@@ -361,6 +365,8 @@ void HandleKey(KeySym key, int key_status)
     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;
@@ -377,11 +383,11 @@ 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;
 
@@ -462,52 +468,58 @@ void HandleKey(KeySym key, int key_status)
 	case XK_7:
 	case XK_8:
 	case XK_9:
-	  Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
-	  printf("method == %d, speed == %d (%s)\n",
-		 Movemethod, Movespeed[Movemethod],
-		 Movespeed_text[Movemethod]);
+	  /*
+	  MoveSpeed = key - XK_0;
+	  printf("speed == %d\n", MoveSpeed);
+	  break;
+	  */
+
+	  if (key == XK_0)
+	    GameSpeed = 50;
+	  else
+	    GameSpeed = key - XK_0;
+	  printf("GameSpeed == %d\n", GameSpeed);
 	  break;
 
 	case XK_a:
-	  Movemethod = !Movemethod;
-	  printf("method == %d, speed == %d (%s)\n",
-		 Movemethod, Movespeed[Movemethod],
-		 Movespeed_text[Movemethod]);
+	  if (ScrollSteps == TILEX/4)
+	    ScrollSteps = TILEX/8;
+	  else
+	    ScrollSteps = TILEX/4;
 	  break;
 
 	case XK_f:
-	  Gamespeed = 2;
-	  printf("gamespeed == %d\n", Gamespeed);
+	  GameSpeed = 2;
+	  printf("GameSpeed == %d\n", GameSpeed);
 	  break;
 	case XK_g:
-	  Gamespeed = 3;
-	  printf("gamespeed == %d\n", Gamespeed);
+	  GameSpeed = 3;
+	  printf("GameSpeed == %d\n", GameSpeed);
 	  break;
 	case XK_h:
-	  Gamespeed = 4;
-	  printf("gamespeed == %d\n", Gamespeed);
+	  GameSpeed = 4;
+	  printf("GameSpeed == %d\n", GameSpeed);
 	  break;
 	case XK_l:
-	  Gamespeed = 10;
-	  printf("gamespeed == %d\n", Gamespeed);
+	  GameSpeed = 50;
+	  printf("GameSpeed == %d\n", GameSpeed);
 	  break;
 
 	case XK_Q:
 	case XK_q:
 	  Dynamite = 1000;
 	  break;
-#endif
 
 	case XK_x:
 
 	  {
-	    int i,j,k, num_steps = 16, step_size = TILEX / num_steps;
+	    int i,j,k, num_steps = 8, 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++)
+	    for(i=0;i<3;i++)
 	    {
 	      for(j=0;j<SCR_FIELDX;j++)
 	      {
@@ -520,11 +532,11 @@ void HandleKey(KeySym key, int key_status)
 		  {
   		    if (DelayReached(&scroll_delay, scroll_delay_value))
   		    {
-  		      XCopyArea(display,backbuffer,window,gc,
+  		      XCopyArea(display,fieldbuffer,window,gc,
   				SX+xxx,SY,
   				SXSIZE-xxx,SYSIZE,
   				SX,SY);
-  		      XCopyArea(display,backbuffer,window,gc,
+  		      XCopyArea(display,fieldbuffer,window,gc,
   				SX,SY,
   				xxx,SYSIZE,
   				SX+SXSIZE-xxx,SY);
@@ -553,6 +565,22 @@ void HandleKey(KeySym key, int key_status)
 
 	  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;
       }
@@ -565,7 +593,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;
@@ -645,13 +673,6 @@ void HandleJoystick()
 	return;
       }
 
-
-
-      if (PlayerMovPos)
-	ScrollFigure(0);
-
-
-
       if (tape.pausing || PlayerGone)
 	joy = 0;
 
@@ -705,9 +726,6 @@ void HandleJoystick()
 	  }
 	}
       }
-
-      DrawPlayerField();
-
       break;
     }
     default: