X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=e770480d67a25c14b0b0e7f0bb3fd57172cba206;hp=3346055722afa7566fa7f249ade02584d18a4f15;hb=0f1e162b9ce8b032e3e50d1cfe9dcc157b4814de;hpb=c0441f4c88acd9bd63f3b30bc4ce22d61ebee10a

diff --git a/src/events.c b/src/events.c
index 33460557..e770480d 100644
--- 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;
@@ -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)