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

diff --git a/src/events.c b/src/events.c
index 63856e59..940fd379 100644
--- a/src/events.c
+++ b/src/events.c
@@ -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)
   {
@@ -263,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)
 {
@@ -351,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;
@@ -370,11 +385,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;
 
@@ -456,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:
@@ -479,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;
 
@@ -487,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++)
 	    {
@@ -501,25 +521,60 @@ 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;
@@ -533,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;
@@ -666,9 +721,6 @@ void HandleJoystick()
 	  }
 	}
       }
-
-      DrawPlayerField();
-
       break;
     }
     default: