colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: options.click_threshold (#309)

Browse Source
This commit is contained in:
christoph-heinrich
2022-10-10 08:56:52 +02:00
committed by GitHub
parent 46ab864adc
commit d3f25af012
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
script-opts/uosc.conf
View File

@@ -142,6 +142,7 @@ font_scale=1
# Border of text and icons when drawn directly on top of video
text_border=1.2
# Execute command for background clicks shorter than this number of milliseconds, 0 to disable
# Filters out double clicks based on `input-doubleclick-time`
click_threshold=0
click_command=cycle pause; script-binding uosc/flash-pause-indicator
# Flash duration in milliseconds used by `flash-{element}` commands

34
scripts/uosc.lua
View File

@@ -4244,26 +4244,22 @@ end
if options.click_threshold > 0 then
-- Executes custom command for clicks shorter than `options.click_threshold`
-- while filtering out double clicks.
local duration_seconds = options.click_threshold / 1000
local last_click = 0
mp.add_key_binding('mbtn_left', 'uosc_mouse', function(tab)
if tab.event == 'up' then
local delta = mp.get_time() - last_click
-- in windowed mode the up event comes shortly after the down event, ignore
if delta > 0.01 and delta < duration_seconds then
last_click = 0
mp.command(options.click_command)
end
else
last_click = mp.get_time()
end
end, {complex = true})
mp.observe_property('mouse-pos', 'native', function(_, mouse)
if mouse.hover and mp.get_time() - last_click < duration_seconds then
last_click = 0
mp.command(options.click_command)
end
local click_time = options.click_threshold / 1000
local doubleclick_time = mp.get_property_native('input-doubleclick-time') / 1000
local last_down, last_up = 0, 0
local click_timer = mp.add_timeout(math.max(click_time, doubleclick_time), function()
local delta = last_up - last_down
if delta > 0 and delta < click_time and delta > 0.02 then mp.command(options.click_command) end
end)
click_timer:kill()
mp.set_key_bindings({{'mbtn_left',
function() last_up = mp.get_time() end,
function()
last_down = mp.get_time()
if click_timer:is_enabled() then click_timer:kill() else click_timer:resume() end
end,
},}, 'mouse_movement', 'force')
mp.enable_key_bindings('mouse_movement', 'allow-vo-dragging+allow-hide-cursor')
end
mp.observe_property('mouse-pos', 'native', function(_, mouse)