mirror of
https://github.com/Kiritow/OpenComputerScripts.git
synced 2024-03-22 13:10:46 +08:00
Breaking change: WaitEvent now follow event.pull
This commit is contained in:
parent
9d4dd91328
commit
9d07e3fedf
20
libevent.lua
20
libevent.lua
|
@ -269,22 +269,12 @@ function RemoveEventListener(ListenerID)
|
||||||
return event.ignore(event.handlers[ListenerID].key,event.handlers[ListenerID].callback)
|
return event.ignore(event.handlers[ListenerID].key,event.handlers[ListenerID].callback)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Usage: WaitEvent([timeout],[event name],[other filter value])
|
||||||
|
-- Example: WaitEvent() WaitEvent(1) WaitEvent("touch") WaitEvent(1,"touch")
|
||||||
|
-- WaitEvent("touch",nil,nil,"somebody")
|
||||||
|
-- WaitEvent(1,"touch",nil,nil,"somebody")
|
||||||
function WaitEvent(...)
|
function WaitEvent(...)
|
||||||
local tb=table.pack(...)
|
return TranslateEvent(table.pack(event.pull(...)))
|
||||||
if(tb.n==0) then -- WaitEvent(),event.pull()
|
|
||||||
return TranslateEvent(table.pack(event.pull()))
|
|
||||||
elseif(type(tb[1])=="string") then
|
|
||||||
if(tb[2]==nil) then -- WaitEvent("key_up"),event.pull("key_up")
|
|
||||||
return TranslateEvent(table.pack(event.pull(tb[1])))
|
|
||||||
else -- WaitEvent("key_up",1),event.pull(1,"key_up")
|
|
||||||
checknumber(tb[2])
|
|
||||||
return TranslateEvent(table.pack(event.pull(tb[2],tb[1])))
|
|
||||||
end
|
|
||||||
elseif(type(tb[1])=="number") then -- WaitEvent(1),event.pull(1)
|
|
||||||
return TranslateEvent(table.pack(event.pull(tb[1])))
|
|
||||||
else
|
|
||||||
error("Syntax error. Usage: WaitEvent([EventName],[TimeOutSecond])")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Usage: WaitMultipleEvent([timeout],Event1,Event2,...)
|
-- Usage: WaitMultipleEvent([timeout],Event1,Event2,...)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user