builder improvements

sys/apis/event.lua

@@ -139,17 +139,25 @@ function Event.addThread(fn)
 end
 
 function Event.pullEvents(...)
-  Process:addThread(_pullEvents)
   local routines = { ... }
   if #routines > 0 then
+    Process:addThread(_pullEvents)
     for _, routine in ipairs(routines) do
       Process:addThread(routine)
     end
-  end
+    while true do
+      local e = Process:pullEvent()
+      if exitPullEvents or e == 'terminate' then
+        break
+      end
+    end
+  else
   while true do
-    local e = Process:pullEvent()
-    if exitPullEvents or e == 'terminate' then
-      break
+    local e = { os.pullEvent() }
+      Event.processEvent(e)
+      if exitPullEvents or e == 'terminate' then
+        break
+      end
     end
   end
 end