mirror of https://github.com/mpv-player/mpv
osc.lua: make shift+mbtn_left an alias of mbtn_mid
...instead of the opposite. This simplifies bind_mouse_buttons().
This commit is contained in:
parent
dc85266aff
commit
940ab99055
|
@ -1696,10 +1696,6 @@ local function bind_mouse_buttons(element_name)
|
||||||
local command = user_opts[element_name .. "_" .. button .. "_command"]
|
local command = user_opts[element_name .. "_" .. button .. "_command"]
|
||||||
|
|
||||||
if command ~= "" then
|
if command ~= "" then
|
||||||
if button == "mbtn_mid" then
|
|
||||||
button = "shift+mbtn_left"
|
|
||||||
end
|
|
||||||
|
|
||||||
elements[element_name].eventresponder[button .. "_up"] = function ()
|
elements[element_name].eventresponder[button .. "_up"] = function ()
|
||||||
mp.command(command)
|
mp.command(command)
|
||||||
end
|
end
|
||||||
|
@ -1820,7 +1816,7 @@ local function osc_init()
|
||||||
ne.content = "\238\128\132"
|
ne.content = "\238\128\132"
|
||||||
ne.eventresponder["mbtn_left_down"] =
|
ne.eventresponder["mbtn_left_down"] =
|
||||||
function () mp.commandv("seek", -5) end
|
function () mp.commandv("seek", -5) end
|
||||||
ne.eventresponder["shift+mbtn_left_down"] =
|
ne.eventresponder["mbtn_mid"] =
|
||||||
function () mp.commandv("frame-back-step") end
|
function () mp.commandv("frame-back-step") end
|
||||||
ne.eventresponder["mbtn_right_down"] =
|
ne.eventresponder["mbtn_right_down"] =
|
||||||
function () mp.commandv("seek", -30) end
|
function () mp.commandv("seek", -30) end
|
||||||
|
@ -1832,7 +1828,7 @@ local function osc_init()
|
||||||
ne.content = "\238\128\133"
|
ne.content = "\238\128\133"
|
||||||
ne.eventresponder["mbtn_left_down"] =
|
ne.eventresponder["mbtn_left_down"] =
|
||||||
function () mp.commandv("seek", 10) end
|
function () mp.commandv("seek", 10) end
|
||||||
ne.eventresponder["shift+mbtn_left_down"] =
|
ne.eventresponder["mbtn_mid"] =
|
||||||
function () mp.commandv("frame-step") end
|
function () mp.commandv("frame-step") end
|
||||||
ne.eventresponder["mbtn_right_down"] =
|
ne.eventresponder["mbtn_right_down"] =
|
||||||
function () mp.commandv("seek", 60) end
|
function () mp.commandv("seek", 60) end
|
||||||
|
@ -2639,13 +2635,13 @@ do_enable_keybindings()
|
||||||
mp.set_key_bindings({
|
mp.set_key_bindings({
|
||||||
{"mbtn_left", function() process_event("mbtn_left", "up") end,
|
{"mbtn_left", function() process_event("mbtn_left", "up") end,
|
||||||
function() process_event("mbtn_left", "down") end},
|
function() process_event("mbtn_left", "down") end},
|
||||||
{"shift+mbtn_left", function() process_event("shift+mbtn_left", "up") end,
|
{"mbtn_mid", function() process_event("mbtn_mid", "up") end,
|
||||||
function() process_event("shift+mbtn_left", "down") end},
|
function() process_event("mbtn_mid", "down") end},
|
||||||
{"mbtn_right", function() process_event("mbtn_right", "up") end,
|
{"mbtn_right", function() process_event("mbtn_right", "up") end,
|
||||||
function() process_event("mbtn_right", "down") end},
|
function() process_event("mbtn_right", "down") end},
|
||||||
-- alias to shift_mbtn_left for single-handed mouse use
|
-- alias shift+mbtn_left to mbtn_mid for touchpads
|
||||||
{"mbtn_mid", function() process_event("shift+mbtn_left", "up") end,
|
{"shift+mbtn_left", function() process_event("mbtn_mid", "up") end,
|
||||||
function() process_event("shift+mbtn_left", "down") end},
|
function() process_event("mbtn_mid", "down") end},
|
||||||
{"wheel_up", function() process_event("wheel_up", "press") end},
|
{"wheel_up", function() process_event("wheel_up", "press") end},
|
||||||
{"wheel_down", function() process_event("wheel_down", "press") end},
|
{"wheel_down", function() process_event("wheel_down", "press") end},
|
||||||
{"mbtn_left_dbl", "ignore"},
|
{"mbtn_left_dbl", "ignore"},
|
||||||
|
|
Loading…
Reference in New Issue