rnd-19990314-2-src

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 8a03effdde53b42af0d2afe7b9f58f201859fd04..60a6ceb3080efa7866519fd7c0de30d1efe2e6c9 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -299,13 +299,15 @@ void HandleFocusEvent(XFocusChangeEvent *event)
        would be far better) set for each X11 window individually.
        The effect would be keyboard auto repeat while playing the game
        (game_status == PLAYING), which is not desired.
-       To avoid this special case, we just wait 1/50 second before
+       To avoid this special case, we just wait 1/10 second before
        processing the 'FocusIn' event.
     */
 
-    Delay(20);
     if (game_status == PLAYING)
+    {
+      Delay(100);
       XAutoRepeatOff(display);
+    }
     if (old_joystick_status != -1)
       joystick_status = old_joystick_status;
   }
@@ -485,16 +487,6 @@ void HandleKey(KeySym key, int key_status)
   /* allow quick escape to the main menu with the Escape key */
   if (key == XK_Escape && game_status != MAINMENU)
   {
-    if (game_status == LEVELED)
-    {
-      /* draw smaller door */
-      XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-               DOOR_GFX_PAGEX7, 64,
-               108, 64,
-               EX - 4, EY - 12);
-      redraw_mask |= REDRAW_ALL;
-    }
-
     CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
     game_status = MAINMENU;
     DrawMainMenu();