Clean up some Haiku toolkit code

* src/haiku_io.c (haiku_read_with_timeout): Accept `bigtime_t'
instead of `time_t' for values which are cast to bigtime_t
anyway.
* src/haiku_support.cc (BMenu_run): Read all help events instead
of just one.
* src/haiku_support.h: Update prototypes.

diff --git a/src/haiku_io.c b/src/haiku_io.c
index ff684df43370f341311e4cea3788263593b24c19..f9fa4095f9fe4b0a94f4c8c144795ee7b9f782ed 100644 (file)
--- a/src/haiku_io.c
+++ b/src/haiku_io.c
@@ -145,7 +145,7 @@ haiku_read (enum haiku_event_type *type, void *buf, ssize_t len)
    Input is blocked when an attempt to read is in progress.  */
 int
 haiku_read_with_timeout (enum haiku_event_type *type, void *buf, ssize_t len,
-                        time_t timeout, bool popup_menu_p)
+                        bigtime_t timeout, bool popup_menu_p)
 {
   int32 typ;
   port_id from = (popup_menu_p

diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index cb8ffaf2d7ba2264ae697cc0496b1f77bcc16935..27d4bbafaf762f6fe00f97dac35861f79438b1fc 100644 (file)
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -2957,7 +2957,7 @@ BMenu_run (void *menu, int x, int y,
 
       if (infos[0].events & B_EVENT_READ)
        {
-         if (!haiku_read_with_timeout (&type, buf, 200, 1000000, true))
+         while (!haiku_read_with_timeout (&type, buf, 200, 0, true))
            {
              switch (type)
                {

diff --git a/src/haiku_support.h b/src/haiku_support.h
index 8b21fafad73431154d777d6ed6ab0377e4449e6b..41bd1e1c84f1478486ef4c5b5ad5c7e8ff0fd937 100644 (file)
--- a/src/haiku_support.h
+++ b/src/haiku_support.h
@@ -420,7 +420,7 @@ extern "C"
 
   extern int
   haiku_read_with_timeout (enum haiku_event_type *type, void *buf, ssize_t len,
-                          time_t timeout, bool popup_menu_p);
+                          bigtime_t timeout, bool popup_menu_p);
 
   extern int
   haiku_write (enum haiku_event_type type, void *buf);