renamed function 'WaitEventFiltered' to 'WaitValidEvent'

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 10950bd9513e2a993531382756a07658583c7996..b51839817a0e480b37be24bc8fb26bab2aee0aca 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -128,7 +128,7 @@ static boolean SkipPressedMouseMotionEvent(const Event *event)
   return FALSE;
 }
 
-static boolean WaitEventFiltered(Event *event)
+static boolean WaitValidEvent(Event *event)
 {
   WaitEvent(event);
 
@@ -152,7 +152,7 @@ static boolean WaitEventFiltered(Event *event)
 boolean NextValidEvent(Event *event)
 {
   while (PendingEvent())
-    if (WaitEventFiltered(event))
+    if (WaitValidEvent(event))
       return TRUE;
 
   return FALSE;
@@ -341,12 +341,10 @@ void EventLoop(void)
 
 void ClearEventQueue()
 {
-  while (PendingEvent())
-  {
-    Event event;
-
-    WaitEvent(&event);
+  Event event;
 
+  while (NextValidEvent(&event))
+  {
     switch (event.type)
     {
       case EVENT_BUTTONRELEASE:
@@ -393,7 +391,8 @@ void SleepWhileUnmapped()
   {
     Event event;
 
-    WaitEvent(&event);
+    if (!WaitValidEvent(&event))
+      continue;
 
     switch (event.type)
     {