X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=6dbb1e7154fd6823a9e5d7ebcfaebbfb9c0830d4;hb=17c100ba4bca1cf8475905b6eeb502e581489c5c;hp=e2d5ab9bdb47ef3fb81caed64112dd411b9e6a63;hpb=fcc90bcfa317ac5af938d552eb0a2df952801219;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index e2d5ab9b..6dbb1e71 100644
--- 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);
@@ -1233,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;
 
@@ -1697,6 +1703,15 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
+  if (HandleGlobalAnimClicks(-1, -1, (key == KSYM_space ||
+				      key == KSYM_Return ||
+				      key == KSYM_Escape)))
+  {
+    /* do not handle this key event anymore */
+    if (key != KSYM_Escape)	/* always allow ESC key to be handled */
+      return;
+  }
+
   if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
       (key == KSYM_Return || key == setup.shortcut.toggle_pause))
   {
@@ -1951,6 +1966,12 @@ void HandleJoystick()
   int dx	= (left ? -1	: right ? 1	: 0);
   int dy	= (up   ? -1	: down  ? 1	: 0);
 
+  if (HandleGlobalAnimClicks(-1, -1, newbutton))
+  {
+    /* do not handle this button event anymore */
+    return;
+  }
+
   switch (game_status)
   {
     case GAME_MODE_TITLE: