X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=f4ab83e3a65b8cf4aa375408ca38e0174428ad42;hb=6467d24a3a0f19645cd5ea89b4ca18a95021d657;hp=53b8171422ab97d250b7f66508d5944fff877726;hpb=4ec434ee1acb955d0e2e8c33558e5f9226904174;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 53b81714..f4ab83e3 100644
--- a/src/events.c
+++ b/src/events.c
@@ -71,6 +71,9 @@ void EventLoop(void)
       Delay(10);
     }
 
+    /* refresh window contents from drawing buffer, if needed */
+    BackToFront();
+
     if (game_status == EXITGAME)
       return;
   }
@@ -270,22 +273,24 @@ void HandleButton(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
 
-  if (mx<0 || my<0)
+  if (button < 0)
   {
     mx = old_mx;
     my = old_my;
+    button = -button;
   }
   else
   {
     old_mx = mx;
     old_my = my;
 
-    HandleGadgets(mx,my, button);
     HandleVideoButtons(mx,my, button);
     HandleSoundButtons(mx,my, button);
     HandleGameButtons(mx,my, button);
   }
 
+  HandleGadgets(mx, my, button);
+
   switch(game_status)
   {
     case MAINMENU:
@@ -503,6 +508,7 @@ void HandleKey(KeySym key, int key_status)
       break;
 
     case LEVELED:
+      HandleLevelEditorKeyInput(key);
       LevelNameTyping(key);
       break;
 
@@ -546,6 +552,22 @@ void HandleKey(KeySym key, int key_status)
 	  break;
 #endif
 
+#if 1
+	case XK_m:
+	  if (MoveSpeed == 8)
+	  {
+	    MoveSpeed = 4;
+	    ScrollStepSize = TILEX/4;
+	  }
+	  else
+	  {
+	    MoveSpeed = 8;
+	    ScrollStepSize = TILEX/8;
+	  }
+	  printf("MoveSpeed == %d\n", MoveSpeed);
+	  break;
+#endif
+
 	case XK_f:
 	  ScrollStepSize = TILEX/8;
 	  printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
@@ -610,7 +632,7 @@ void HandleNoXEvent()
 {
   if (button_status && game_status != PLAYING)
   {
-    HandleButton(-1,-1, button_status);
+    HandleButton(0, 0, -button_status);
     return;
   }
 
@@ -676,7 +698,8 @@ void HandleJoystick()
     {
       static unsigned long joystickmove_delay = 0;
 
-      if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
+      if (joystick && !button &&
+	  !DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
 	newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)