X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=60a6ceb3080efa7866519fd7c0de30d1efe2e6c9;hb=0c27626bae90cb1eeea4939de0130a49b9aac507;hp=61d1fc8d4d7eb5665014877f794b5e4d1e7bb54d;hpb=9fc7b9df17e6cc518d82ea6572ed69dc07f49689;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index 61d1fc8d..60a6ceb3 100644 --- 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; } @@ -334,12 +336,6 @@ void HandleButton(int mx, int my, int button) { old_mx = mx; old_my = my; - - /* - HandleVideoButtons(mx,my, button); - HandleSoundButtons(mx,my, button); - HandleGameButtons(mx,my, button); - */ } HandleGadgets(mx, my, button); @@ -491,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();