Make `EventType` enum private to input.c

This enum doesn't need to be public since `event_poll` is only interested in
user input(but other events may be handled by libuv callbacks).

1 files changed, 7 insertions, 7 deletions

diff --git a/src/os/event.c b/src/os/event.c
index 1abde8d075..0a7d2c096c 100644
--- a/src/os/event.c
+++ b/src/os/event.c
@@ -19,15 +19,14 @@ void event_init()
 }
 
 /* Wait for some event */
-EventType event_poll(int32_t ms)
+bool event_poll(int32_t ms)
 {
   bool timed_out;
-  EventType event;
   uv_run_mode run_mode = UV_RUN_ONCE;
 
-  if ((event = input_check()) != kEventNone) {
+  if (input_ready()) {
     /* If there's a pending input event to be consumed, do it now */
-    return event;
+    return true;
   }
 
   input_start();
@@ -47,11 +46,12 @@ EventType event_poll(int32_t ms)
   }
 
   do {
-    /* Wait for some event */
+    /* Run one event loop iteration, blocking for events if run_mode is
+     * UV_RUN_ONCE */
     uv_run(uv_default_loop(), run_mode);
   } while (
       /* Continue running if ... */
-      (event = input_check()) == kEventNone && /* ... we have no input */
+      !input_ready() && /* ... we have no input */
       run_mode != UV_RUN_NOWAIT && /* ... ms != 0 */
       !timed_out  /* ... we didn't get a timeout */
       );
@@ -64,7 +64,7 @@ EventType event_poll(int32_t ms)
     uv_timer_stop(&timer_req);
   }
 
-  return event;
+  return input_ready();
 }
 
 /* Set a flag in the `event_poll` loop for signaling of a timeout */