mirror of
https://github.com/mpv-player/mpv.git
synced 2026-05-07 20:02:49 +00:00
CogentRedTester
0af0c137bb
This commit uses the undocumented `mp.flush_keybindings()` method to ensure that all `console.lua` keybinds are set before sending the `opened` event to `mp.input` clients. Previously, the keybinds would only be flushed when `console.lua` went idle. As the `opened` event is sent before this happens, clients processing the event may end up flushing their own keybinds before this happens. This makes it unreliable to use the `opened` event to override keybinds set by `console.lua`; for example, adding different behaviour to `input.select` when using `Shift+Enter` instead of `Enter`. This commit allows the `opened` callback to be used to safely override `console.lua` keybinds. .luacheckrc: move flush_keybindings to globals
111 lines
3.5 KiB
Lua
111 lines
3.5 KiB
Lua
local mp_globals = {
|
|
mp = {
|
|
fields = {
|
|
command = {},
|
|
commandv = {},
|
|
command_native = {},
|
|
command_native_async = {},
|
|
add_hook = {},
|
|
abort_async_command = {},
|
|
del_property = {},
|
|
get_property = {},
|
|
get_property_osd = {},
|
|
get_property_bool = {},
|
|
get_property_number = {},
|
|
get_property_native = {},
|
|
set_property = {},
|
|
set_property_bool = {},
|
|
set_property_number = {},
|
|
set_property_native = {},
|
|
get_time = {},
|
|
add_key_binding = {},
|
|
add_forced_key_binding = {},
|
|
remove_key_binding = {},
|
|
register_event = {},
|
|
unregister_event = {},
|
|
observe_property = {},
|
|
unobserve_property = {},
|
|
add_timeout = {},
|
|
add_periodic_timer = {},
|
|
get_opt = {},
|
|
get_script_name = {},
|
|
get_script_directory = {},
|
|
osd_message = {},
|
|
get_wakeup_pipe = {},
|
|
get_next_timeout = {},
|
|
dispatch_events = {},
|
|
register_idle = {},
|
|
unregister_idle = {},
|
|
enable_messages = {},
|
|
register_script_message = {},
|
|
unregister_script_message = {},
|
|
create_osd_overlay = {},
|
|
get_osd_size = {},
|
|
msg = {
|
|
fields = {
|
|
fatal = {},
|
|
error = {},
|
|
warn = {},
|
|
info = {},
|
|
verbose = {},
|
|
debug = {},
|
|
trace = {},
|
|
}
|
|
},
|
|
-- Not documented
|
|
-- TODO: Document or remove them
|
|
disable_key_bindings = {},
|
|
enable_key_bindings = {},
|
|
find_config_file = {},
|
|
flush_keybindings = {},
|
|
format_time = {},
|
|
get_mouse_pos = {},
|
|
set_key_bindings = {},
|
|
set_mouse_area = {},
|
|
set_osd_ass = {},
|
|
}
|
|
},
|
|
exit = {},
|
|
unpack = {},
|
|
}
|
|
|
|
local mp_internal = {
|
|
mp = {
|
|
fields = {
|
|
-- Internal
|
|
-- TODO: Move to mp_internal module
|
|
ARRAY = { fields = { info = {}, type = {} }},
|
|
MAP = { fields = { info = {}, type = {} }},
|
|
UNKNOWN_TYPE = { fields = { info = {}, type = {} }},
|
|
_legacy_overlay = { fields = { res_x = {}, res_y = {}, data = {}, update = {} }},
|
|
cancel_timer = {},
|
|
get_osd_margins = {},
|
|
input_define_section = {},
|
|
input_disable_section = {},
|
|
input_enable_section = {},
|
|
input_set_section_mouse_area = {},
|
|
keep_running = {},
|
|
log = {},
|
|
raw_abort_async_command = {},
|
|
raw_command_native_async = {},
|
|
raw_hook_add = {},
|
|
raw_hook_continue = {},
|
|
raw_observe_property = {},
|
|
raw_unobserve_property = {},
|
|
raw_wait_event = {},
|
|
request_event = {},
|
|
script_name = {},
|
|
use_suspend = {},
|
|
wait_event = {},
|
|
}
|
|
}
|
|
}
|
|
|
|
std = "min+mp"
|
|
stds = { mp = { read_globals = mp_globals } }
|
|
-- mp_internal seems to be merged with mp for other files too...
|
|
files["player/lua/defaults.lua"] = { globals = mp_internal }
|
|
files["player/lua/auto_profiles.lua"] = { globals = { "p", "get" } }
|
|
files["player/lua/select.lua"] = { globals = { "p", "get" } }
|
|
max_line_length = 100
|