added ignoring screen navigation events if text input gadgets are active

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 417d149bc0d47feb4133f377224b1d615b647cf0..9f18adbe8b413dce59899fe9ac17cb35cec9243a 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -2113,6 +2113,10 @@ void HandleKey(Key key, int key_status)
     case GAME_MODE_SETUP:
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:
     case GAME_MODE_SETUP:
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:

+
+      if (anyTextGadgetActiveOrJustFinished && key != KSYM_Escape)
+       break;
+

       switch (key)
       {
        case KSYM_space:
       switch (key)
       {
        case KSYM_space:


@@ -2393,6 +2397,9 @@ void HandleJoystick(void)
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:
     {
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:
     {

+      if (anyTextGadgetActive())
+       break;
+

       if (game_status == GAME_MODE_TITLE)
        HandleTitleScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       else if (game_status == GAME_MODE_MAIN)
       if (game_status == GAME_MODE_TITLE)
        HandleTitleScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       else if (game_status == GAME_MODE_MAIN)