From 70357bcc12a82ce34b9a597cf2ebdb176724a222 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Tue, 28 Nov 2017 09:28:50 +0100 Subject: [PATCH] cleanup of function names related to processing (no) pending events --- src/events.c | 17 ++++++++++++++--- src/events.h | 1 - 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/events.c b/src/events.c index 18898fb2..0fd37032 100644 --- a/src/events.c +++ b/src/events.c @@ -39,6 +39,12 @@ static int cursor_mode_last = CURSOR_DEFAULT; static unsigned int special_cursor_delay = 0; static unsigned int special_cursor_delay_value = 1000; + +/* forward declarations for internal use */ +static void HandleNoEvent(void); +static void HandleEventActions(void); + + /* event filter especially needed for SDL event filtering due to delay problems with lots of mouse motion events when mouse button not pressed (X11 can handle this with 'PointerMotionHintMask') */ @@ -318,10 +324,10 @@ void EventLoop(void) if (PendingEvent()) HandleEvents(); else - HandleMouseCursor(); + HandleNoEvent(); - /* also execute after pending events have been processed before */ - HandleNoEvent(); + /* execute event related actions after pending events have been processed */ + HandleEventActions(); /* don't use all CPU time when idle; the main loop while playing has its own synchronization and is CPU friendly, too */ @@ -1923,6 +1929,11 @@ void HandleKey(Key key, int key_status) } void HandleNoEvent() +{ + HandleMouseCursor(); +} + +void HandleEventActions() { // if (button_status && game_status != GAME_MODE_PLAYING) if (button_status && (game_status != GAME_MODE_PLAYING || diff --git a/src/events.h b/src/events.h index 71ff7627..83d869ad 100644 --- a/src/events.h +++ b/src/events.h @@ -38,7 +38,6 @@ void HandleFocusEvent(FocusChangeEvent *); void HandleClientMessageEvent(ClientMessageEvent *); void HandleWindowManagerEvent(Event *); -void HandleNoEvent(void); void HandleToonAnimations(void); void HandleButton(int, int, int, int); -- 2.34.1