summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-26 00:59:19 +0100
committerwm4 <wm4@nowhere>2014-02-26 00:59:19 +0100
commit9a7a3d125be38d46db0bf5de26e9c41392cc63fb (patch)
treed4fe395bd6eca4711664cdd61cbb99242376fa8a /player
parentf3c933e5d3501c71e7f38dc62b27096a90090d5e (diff)
downloadmpv-9a7a3d125be38d46db0bf5de26e9c41392cc63fb.tar.bz2
mpv-9a7a3d125be38d46db0bf5de26e9c41392cc63fb.tar.xz
osd: override user bindings for OSC input
E.g. binding MOUSE_BTN0 always used the user defined binding. While it is ok that the user can override mouse_move and mouse_leave (for whatever reasons), we want to strictly override the bindings when input is sent to the OSC itself. Regression since 03624a1.
Diffstat (limited to 'player')
-rw-r--r--player/lua.c4
-rw-r--r--player/lua/defaults.lua4
-rw-r--r--player/lua/osc.lua2
3 files changed, 5 insertions, 5 deletions
diff --git a/player/lua.c b/player/lua.c
index 826de209ed..9e5e2c96a5 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -750,9 +750,9 @@ static int script_input_define_section(lua_State *L)
char *contents = (char *)luaL_checkstring(L, 2);
char *flags = (char *)luaL_optstring(L, 3, "");
bool builtin = true;
- if (strcmp(flags, "builtin") == 0) {
+ if (strcmp(flags, "default") == 0) {
builtin = true;
- } else if (strcmp(flags, "default") == 0) {
+ } else if (strcmp(flags, "force") == 0) {
builtin = false;
} else if (strcmp(flags, "") == 0) {
//pass
diff --git a/player/lua/defaults.lua b/player/lua/defaults.lua
index 3f3dab7490..4f90b1d234 100644
--- a/player/lua/defaults.lua
+++ b/player/lua/defaults.lua
@@ -27,7 +27,7 @@ local default_section = "input_dispatch_" .. mp.script_name
-- callback can be a string too, in which case the following will be added like
-- an input.conf line: key .. " " .. callback
-- (And callback_down is ignored.)
-function mp.set_key_bindings(list, section)
+function mp.set_key_bindings(list, section, flags)
local cfg = ""
for i = 1, #list do
local entry = list[i]
@@ -42,7 +42,7 @@ function mp.set_key_bindings(list, section)
cfg = cfg .. key .. " " .. cb .. "\n"
end
end
- mp.input_define_section(section or default_section, cfg)
+ mp.input_define_section(section or default_section, cfg, flags)
end
function mp.enable_key_bindings(section, flags)
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 0ccb4c3552..4f217d33c5 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -1279,5 +1279,5 @@ mp.set_key_bindings({
{"mouse_btn0_dbl", "ignore"},
{"shift+mouse_btn0_dbl", "ignore"},
{"mouse_btn2_dbl", "ignore"},
-}, "input")
+}, "input", "force")
mp.enable_key_bindings("input")