Partydeck/Monarch-Extension
3
0
Fork 0
mirror of https://github.com/britzl/monarch.git synced 2025-09-28 02:22:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from AGulev/master

Browse Source 
Replace strings with constants / new type of transactions / information for the focus messages
This commit is contained in:
Björn Ritzl
2017-11-27 21:21:46 +01:00
committed by GitHub
parent c9cf627977 4ead8d9d42
commit 62684f9795
5 changed files with 142 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
monarch/monarch.lua
View File

@@ -8,13 +8,25 @@ local CONTEXT = hash("monarch_context")
local PROXY_LOADED = hash("proxy_loaded")
local PROXY_UNLOADED = hash("proxy_unloaded")
M.TRANSITION_DONE = hash("transition_done")
local RELEASE_INPUT_FOCUS = hash("release_input_focus")
local ACQUIRE_INPUT_FOCUS = hash("acquire_input_focus")
local ASYNC_LOAD = hash("async_load")
local UNLOAD = hash("unload")
local ENABLE = hash("enable")
M.TRANSITION = {}
M.TRANSITION.DONE = hash("transition_done")
M.TRANSITION.SHOW_IN = hash("transition_show_in")
M.TRANSITION.SHOW_OUT = hash("transition_show_out")
M.TRANSITION.BACK_IN = hash("transition_back_in")
M.TRANSITION.BACK_OUT = hash("transition_back_out")
M.FOCUS_GAINED = hash("monarch_focus_gained")
M.FOCUS_LOST = hash("monarch_focus_lost")
local function screen_from_proxy(proxy)
for _,screen in pairs(screens) do
for _, screen in pairs(screens) do
if screen.proxy == proxy then
return screen
end
@@ -23,7 +35,7 @@ end
local function screen_from_script()
local url = msg.url()
for _,screen in pairs(screens) do
for _, screen in pairs(screens) do
if screen.script == url then
return screen
end
@@ -31,7 +43,7 @@ local function screen_from_script()
end
local function in_stack(id)
for i=1,#stack do
for i = 1, #stack do
if stack[i].id == id then
return true
end
@@ -60,18 +72,18 @@ local function show_out(screen, next_screen, cb)
local co
co = coroutine.create(function()
screen.co = co
msg.post(screen.script, "release_input_focus")
msg.post(screen.script, RELEASE_INPUT_FOCUS)
msg.post(screen.script, CONTEXT)
coroutine.yield()
if not next_screen.popup then
msg.post(screen.transition_url, "transition_show_out")
msg.post(screen.transition_url, M.TRANSITION.SHOW_OUT)
coroutine.yield()
msg.post(screen.proxy, "unload")
msg.post(screen.proxy, UNLOAD)
coroutine.yield()
screen.loaded = false
end
if screen.focus_url then
msg.post(screen.focus_url, M.FOCUS_LOST)
msg.post(screen.focus_url, M.FOCUS_LOST, {id = next_screen.id})
end
screen.co = nil
if cb then cb() end
@@ -86,7 +98,7 @@ local function show_in(screen, reload, cb)
msg.post(screen.script, CONTEXT)
coroutine.yield()
if reload and screen.loaded then
msg.post(screen.proxy, "unload")
msg.post(screen.proxy, UNLOAD)
coroutine.yield()
screen.loaded = false
end
@@ -94,17 +106,17 @@ local function show_in(screen, reload, cb)
-- and the popup asked to show this screen again
-- in that case we shouldn't attempt to load it again
if not screen.loaded then
msg.post(screen.proxy, "async_load")
msg.post(screen.proxy, ASYNC_LOAD)
coroutine.yield()
msg.post(screen.proxy, "enable")
msg.post(screen.proxy, ENABLE)
screen.loaded = true
end
stack[#stack + 1] = screen
msg.post(screen.transition_url, "transition_show_in")
msg.post(screen.transition_url, M.TRANSITION.SHOW_IN)
coroutine.yield()
msg.post(screen.script, "acquire_input_focus")
msg.post(screen.script, ACQUIRE_INPUT_FOCUS)
if screen.focus_url then
msg.post(screen.focus_url, M.FOCUS_GAINED)
msg.post(screen.focus_url, M.FOCUS_GAINED, {id = screen.id})
end
screen.co = nil
if cb then cb() end
@@ -119,16 +131,16 @@ local function back_in(screen, previous_screen, cb)
msg.post(screen.script, CONTEXT)
coroutine.yield()
if not previous_screen.popup then
msg.post(screen.proxy, "async_load")
msg.post(screen.proxy, ASYNC_LOAD)
coroutine.yield()
msg.post(screen.proxy, "enable")
msg.post(screen.proxy, ENABLE)
screen.loaded = true
msg.post(screen.transition_url, "transition_back_in")
msg.post(screen.transition_url, M.TRANSITION.BACK_IN)
coroutine.yield()
end
msg.post(screen.script, "acquire_input_focus")
msg.post(screen.script, ACQUIRE_INPUT_FOCUS)
if screen.focus_url then
msg.post(screen.focus_url, M.FOCUS_GAINED)
msg.post(screen.focus_url, M.FOCUS_GAINED, {id = previous_screen.id})
end
screen.co = nil
if cb then cb() end
@@ -140,16 +152,16 @@ local function back_out(screen, cb)
local co
co = coroutine.create(function()
screen.co = co
msg.post(screen.script, "release_input_focus")
msg.post(screen.script, RELEASE_INPUT_FOCUS)
msg.post(screen.script, CONTEXT)
coroutine.yield()
msg.post(screen.transition_url, "transition_back_out")
msg.post(screen.transition_url, M.TRANSITION.BACK_OUT)
coroutine.yield()
msg.post(screen.proxy, "unload")
msg.post(screen.proxy, UNLOAD)
coroutine.yield()
screen.loaded = false
if screen.focus_url then
msg.post(screen.focus_url, M.FOCUS_LOST)
msg.post(screen.focus_url, M.FOCUS_LOST, {id = screen.id})
end
screen.co = nil
if cb then cb() end
@@ -254,7 +266,7 @@ function M.on_message(message_id, message, sender)
local screen = screen_from_script()
assert(screen, "Unable to find screen for current script url")
coroutine.resume(screen.co)
elseif message_id == M.TRANSITION_DONE then
elseif message_id == M.TRANSITION.DONE then
local screen = screen_from_script()
assert(screen, "Unable to find screen for current script url")
coroutine.resume(screen.co)
@@ -263,7 +275,7 @@ end
function M.dump_stack()
local s = ""
for i,screen in ipairs(stack) do
for i, screen in ipairs(stack) do
s = s .. ("%d = %s\n"):format(i, tostring(screen.id))
end
return s