Skip to content

Improve compatibility with mpv-menu-plugin #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve compatibility with mpv-menu-plugin #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions memo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ function write_history(display)
end
end

function show_history(entries, next_page, prev_page, update, return_items)
function show_history(entries, next_page, prev_page, update, return_items, dyn_menu)
if event_loop_exhausted then return end
event_loop_exhausted = true

Expand Down Expand Up @@ -1154,7 +1154,10 @@ function show_history(entries, next_page, prev_page, update, return_items)
end

if return_items then
return menu_items
if not dyn_menu then
return menu_items
end
return_items = shallow_copy(menu_items)
end

if options.pagination then
Expand All @@ -1166,10 +1169,15 @@ function show_history(entries, next_page, prev_page, update, return_items)
end
end

menu_data = menu_json(menu_items, state.current_page)
state.pages[state.current_page] = menu_items
last_state = state

if return_items then
return return_items
end

menu_data = menu_json(menu_items, state.current_page)

if uosc_available then
uosc_update()
else
Expand Down Expand Up @@ -1310,7 +1318,7 @@ end
function dyn_menu_update()
search_words = nil
event_loop_exhausted = false
local items = show_history(options.entries, false, false, false, true)
local items = show_history(options.entries, false, false, false, true, true)
event_loop_exhausted = false

local menu = {
Expand Down Expand Up @@ -1340,7 +1348,7 @@ function dyn_menu_update()
}
end
if last_state.cursor > 0 then
menu.submenu[#menu.submenu + 1] = {title = "...", cmd = "script-binding memo-next"}
menu.submenu[#menu.submenu + 1] = {title = "...", cmd = "script-binding memo-dyn-menu-next"}
end
else
menu.submenu[#menu.submenu + 1] = {
Expand All @@ -1358,6 +1366,18 @@ mp.register_script_message("memo-search-uosc:", memo_search_uosc)

mp.add_key_binding(nil, "memo-next", memo_next)
mp.add_key_binding(nil, "memo-prev", memo_prev)
mp.add_key_binding(nil, "memo-dyn-menu-next", function()
if event_loop_exhausted then return end
if search_words or last_state == nil then
search_words = nil
show_history(options.entries, false, false, false, true, true)
event_loop_exhausted = false
end
if not menu_shown or last_state.current_page > 2 then
last_state.current_page = 1
end
show_history(options.entries, true)
end)
mp.add_key_binding(nil, "memo-log", function()
write_history(true)

Expand Down