X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=5542bd4117a45e6aa570c5e7d32581e3d6b093c3;hb=cc17a49a1a63c1df0e55a5afd510698e21b71dfe;hp=2fe47e4de408086cd4b5d5cc7e1a8c0923c8830d;hpb=cd47bf969c6d8c602b8f5dfa100f0be944bd0e46;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 2fe47e4d..5542bd41 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;
   }
@@ -223,16 +226,44 @@ void HandleButtonEvent(XButtonEvent *event)
 
 void HandleMotionEvent(XMotionEvent *event)
 {
+  Window root, child;
+  int root_x, root_y;
+  int win_x, win_y;
+  unsigned int mask;
+
+  if (!XQueryPointer(display, window, &root, &child, &root_x, &root_y,
+		     &win_x, &win_y, &mask))
+    return;
+
+  if (!button_status && game_status != LEVELED)
+    return;
+
   motion_status = TRUE;
 
-  HandleButton(event->x, event->y, button_status);
+  HandleButton(win_x, win_y, button_status);
 }
 
 void HandleKeyEvent(XKeyEvent *event)
 {
   int key_status = (event->type == KeyPress ? KEY_PRESSED : KEY_RELEASED);
-  unsigned int event_state = (game_status != PLAYING ? event->state : 0);
-  KeySym key = XLookupKeysym(event, event_state);
+  KeySym key;
+
+  if (game_status == PLAYING)
+  {
+    /* use '0' instead of 'event->state' to get the key without modifiers */
+    key = XLookupKeysym(event, 0);
+  }
+  else
+  {
+    /* get the key with all modifiers */
+    char buffer[10];
+    int buffer_size = 10;
+    XComposeStatus compose;
+    int char_count;
+
+    char_count = XLookupString(event, buffer, buffer_size, &key, &compose);
+    buffer[char_count] = '\0';
+  }
 
   HandleKey(key, key_status);
 }
@@ -270,22 +301,26 @@ 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:
@@ -332,7 +367,12 @@ void HandleButton(int mx, int my, int button)
 	  int x = LEVELX(sx);
 	  int y = LEVELY(sy);
 
-	  printf("INFO: Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
+	  printf("INFO: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
+
+	  if (!IN_LEV_FIELD(x, y))
+	    break;
+
+	  printf("      Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
 	  printf("      Store[%d][%d] == %d\n", x,y, Store[x][y]);
 	  printf("      Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
 	  printf("      StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
@@ -429,7 +469,17 @@ void HandleKey(KeySym key, int key_status)
   /* allow quick escape to the main menu with the Escape key */
   if (key == XK_Escape && game_status != MAINMENU)
   {
-    CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
+    if (game_status == LEVELED)
+    {
+      /* draw smaller door */
+      XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+		DOOR_GFX_PAGEX7, 64,
+		108, 64,
+		EX - 4, EY - 12);
+      redraw_mask |= REDRAW_ALL;
+    }
+
+    CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
     game_status = MAINMENU;
     DrawMainMenu();
     return;
@@ -446,6 +496,8 @@ void HandleKey(KeySym key, int key_status)
 
 
 
+  HandleGadgetsKeyInput(key);
+
   switch(game_status)
   {
     case TYPENAME:
@@ -493,6 +545,7 @@ void HandleKey(KeySym key, int key_status)
       break;
 
     case LEVELED:
+      HandleLevelEditorKeyInput(key);
       LevelNameTyping(key);
       break;
 
@@ -536,6 +589,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);
@@ -600,7 +669,7 @@ void HandleNoXEvent()
 {
   if (button_status && game_status != PLAYING)
   {
-    HandleButton(-1,-1, button_status);
+    HandleButton(0, 0, -button_status);
     return;
   }
 
@@ -666,7 +735,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)