removed experimental (Windows specific) drag and drop test code

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 8c8ae5a910f25ee6fb41a11d0661dad4bd062e0a..e770480d67a25c14b0b0e7f0bb3fd57172cba206 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -268,10 +268,6 @@ void HandleOtherEvents(Event *event)
       HandleJoystickEvent(event);
       break;
 
-    case SDL_SYSWMEVENT:
-      HandleWindowManagerEvent(event);
-      break;
-
     default:
       break;
   }
@@ -1522,11 +1518,6 @@ void HandleClientMessageEvent(ClientMessageEvent *event)
     CloseAllAndExit(0);
 }
 
-void HandleWindowManagerEvent(Event *event)
-{
-  SDLHandleWindowManagerEvent(event);
-}
-
 void HandleButton(int mx, int my, int button, int button_nr)
 {
   static int old_mx = 0, old_my = 0;
@@ -1849,9 +1840,9 @@ boolean HandleKeysDebug(Key key, int key_status)
       return TRUE;
     }
   }
+#endif
 
   return FALSE;
-#endif
 }
 
 void HandleKey(Key key, int key_status)
@@ -2360,6 +2351,16 @@ void HandleJoystick(void)
     return;
   }
 
+  if (newbutton && (game_status == GAME_MODE_PSEUDO_TYPENAME ||
+                   anyTextGadgetActive()))
+  {
+    // leave name input in main menu or text input gadget
+    HandleKey(KSYM_Escape, KEY_PRESSED);
+    HandleKey(KSYM_Escape, KEY_RELEASED);
+
+    return;
+  }
+
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
   {
     if (game_status == GAME_MODE_PLAYING)