changed click events for global animations to ignore 'consumed' clicks

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 0aa4185af0696700c32810874520ac6687621881..93b135503b073c32e9a34ee79ccf5fbbcf13562a 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -532,8 +532,8 @@ void HandleWindowEvent(WindowEvent *event)
       if (new_window_width  != video.window_width ||
          new_window_height != video.window_height)
       {
-       int new_xpercent = (100 * new_window_width  / video.screen_width);
-       int new_ypercent = (100 * new_window_height / video.screen_height);
+       int new_xpercent = 100.0 * new_window_width  / video.screen_width  + .5;
+       int new_ypercent = 100.0 * new_window_height / video.screen_height + .5;
 
        // (extreme window scaling allowed, but cannot be saved permanently)
        video.window_scaling_percent = MIN(new_xpercent, new_ypercent);
@@ -617,15 +617,30 @@ void HandleFingerEvent(FingerEvent *event)
   {
     int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
                      KEY_PRESSED);
-    Key key = (event->x < 1.0 / 3.0 ?
-              (event->y < 1.0 / 2.0 ? setup.input[0].key.snap :
-               setup.input[0].key.drop) :
-              event->x > 2.0 / 3.0 ?
-              (event->y < 1.0 / 3.0 ? setup.input[0].key.up :
-               event->y > 2.0 / 3.0 ? setup.input[0].key.down :
-               event->x < 5.0 / 6.0 ? setup.input[0].key.left :
-               setup.input[0].key.right) :
+    float ypos = 1.0 - 1.0 / 3.0 * video.display_width / video.display_height;
+
+    event_y = (event_y - ypos) / (1 - ypos);
+
+    Key key = (event_x > 0         && event_x < 1.0 / 6.0 &&
+              event_y > 2.0 / 3.0 && event_y < 1 ?
+              setup.input[0].key.snap :
+              event_x > 1.0 / 6.0 && event_x < 1.0 / 3.0 &&
+              event_y > 2.0 / 3.0 && event_y < 1 ?
+              setup.input[0].key.drop :
+              event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
+              event_y > 0         && event_y < 1.0 / 3.0 ?
+              setup.input[0].key.up :
+              event_x > 6.0 / 9.0 && event_x < 7.0 / 9.0 &&
+              event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
+              setup.input[0].key.left :
+              event_x > 8.0 / 9.0 && event_x < 1 &&
+              event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
+              setup.input[0].key.right :
+              event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
+              event_y > 2.0 / 3.0 && event_y < 1 ?
+              setup.input[0].key.down :
               KSYM_UNDEFINED);
+
     char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" :
                             "KEY_PRESSED");
     int i;
@@ -1218,6 +1233,12 @@ void HandleButton(int mx, int my, int button, int button_nr)
   }
 #endif
 
+  if (HandleGlobalAnimClicks(mx, my, button))
+  {
+    /* do not handle this button event anymore */
+    mx = my = -32;     /* force mouse event to be outside screen tiles */
+  }
+
   if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
     return;
 
@@ -1418,7 +1439,7 @@ void HandleKeysDebug(Key key)
          (mod_key_pressed == setup.debug.frame_delay_use_mod_key))
       {
        GameFrameDelay = (GameFrameDelay != setup.debug.frame_delay[i] ?
-                         setup.debug.frame_delay[i] : GAME_FRAME_DELAY);
+                         setup.debug.frame_delay[i] : setup.game_frame_delay);
 
        if (!setup.debug.frame_delay_game_only)
          MenuFrameDelay = GameFrameDelay;