summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Halachmi (:avih) <avihpit@yahoo.com>2019-12-23 13:32:07 +0200
committerAvi Halachmi (:avih) <avihpit@yahoo.com>2019-12-23 17:52:34 +0200
commit5a74bf5f95b2e94abd2d6aed1a2f82236281f51b (patch)
tree67b7a10d997fc87e176f8dfc02205dbab3a801d7
parent7ed70f925be815c853c54e73e2789b7094becf3a (diff)
downloadmpv-5a74bf5f95b2e94abd2d6aed1a2f82236281f51b.tar.bz2
mpv-5a74bf5f95b2e94abd2d6aed1a2f82236281f51b.tar.xz
js: batch key bindings updates (match 96932fe7)
Implemented using one-time idle observer (i.e. setTimeout), to avoid additional function call(back) every time the event loop enters idle. The lua mp.flush_key_bindings() is also available, also undocumented.
-rw-r--r--player/javascript/defaults.js15
1 files changed, 12 insertions, 3 deletions
diff --git a/player/javascript/defaults.js b/player/javascript/defaults.js
index fba5b10144..2ae3fe74d0 100644
--- a/player/javascript/defaults.js
+++ b/player/javascript/defaults.js
@@ -205,7 +205,8 @@ function dispatch_key_binding(name, state, key_name) {
cb(state, key_name);
}
-function update_input_sections() {
+var binds_tid = 0; // flush timer id. actual id's are always true-thy
+mp.flush_key_bindings = function flush_key_bindings() {
var def = [], forced = [];
for (var n in binds) // Array.join() will later skip undefined .input
(binds[n].forced ? forced : def).push(binds[n].input);
@@ -217,6 +218,14 @@ function update_input_sections() {
sect = "input_forced_" + mp.script_name;
mp.commandv("define-section", sect, forced.join("\n"), "force");
mp.commandv("enable-section", sect, "allow-hide-cursor+allow-vo-dragging");
+
+ clearTimeout(binds_tid); // cancel future flush if called directly
+ binds_tid = 0;
+}
+
+function sched_bindings_flush() {
+ if (!binds_tid)
+ binds_tid = setTimeout(mp.flush_key_bindings, 0); // fires on idle
}
// name/opts maybe omitted. opts: object with optional bool members: repeatable,
@@ -263,7 +272,7 @@ function add_binding(forced, key, name, fn, opts) {
if (key)
key_data.input = key + " script-binding " + mp.script_name + "/" + name;
binds[name] = key_data; // used by user and/or our (key) script-binding
- update_input_sections();
+ sched_bindings_flush();
}
mp.add_key_binding = add_binding.bind(null, false);
@@ -272,7 +281,7 @@ mp.add_forced_key_binding = add_binding.bind(null, true);
mp.remove_key_binding = function(name) {
mp.unregister_script_message(name);
delete binds[name];
- update_input_sections();
+ sched_bindings_flush();
}
/**********************************************************************