Skip to content
This repository has been archived by the owner on Oct 14, 2022. It is now read-only.

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@fernbacher
fernbacher authored Jun 12, 2022
1 parent 331f44c commit 9876f9e
Showing 1 changed file with 166 additions and 36 deletions.
202 changes: 166 additions & 36 deletions scripts/uosc.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--[[
uosc 2.13.1 - 2021-Jan-19 | https://github.com/darsain/uosc
uosc 2.17.0 - 2022-Apr-30 | https://github.com/darsain/uosc
Minimalist cursor proximity based UI for MPV player.
Expand Down Expand Up @@ -73,7 +73,18 @@ menu_hjkl_navigation=no
menu_opacity=0.8
menu_font_scale=1
# top bar with window controls and media title shown only in no-border mode
# menu button widget
# can be: never, bottom-bar, center
menu_button=never
menu_button_size=26
menu_button_size_fullscreen=30
menu_button_persistency=
menu_button_opacity=1
menu_button_border=1
# top bar with window controls and media title
# can be: never, no-border, always
top_bar=no-border
top_bar_size=40
top_bar_size_fullscreen=46
top_bar_persistency=
Expand Down Expand Up @@ -118,6 +129,8 @@ subtitle_types=aqt,gsub,jss,sub,ttxt,pjs,psb,rt,smi,slt,ssf,srt,ssa,ass,usf,idx,
# if you are using some wide font and see a lot of right side clipping in menus,
# try bumping this up
font_height_to_letter_width_ratio=0.5
# default open-file menu directory
default_directory=~/
# `chapter_ranges` lets you transform chapter indicators into range indicators.
#
Expand Down Expand Up @@ -168,6 +181,7 @@ Available keybindings (place into `input.conf`):
Key script-binding uosc/peek-timeline
Key script-binding uosc/toggle-progress
Key script-binding uosc/flash-timeline
Key script-binding uosc/flash-top-bar
Key script-binding uosc/flash-volume
Key script-binding uosc/flash-speed
Key script-binding uosc/flash-pause-indicator
Expand Down Expand Up @@ -236,7 +250,7 @@ local options = {

speed = false,
speed_size = 46,
speed_size_fullscreen = 68,
speed_size_fullscreen = 60,
speed_persistency = '',
speed_opacity = 1,
speed_step = 0.1,
Expand All @@ -249,6 +263,14 @@ local options = {
menu_opacity = 0.8,
menu_font_scale = 1,

menu_button = 'never',
menu_button_size = 26,
menu_button_size_fullscreen = 30,
menu_button_opacity = 1,
menu_button_persistency = '',
menu_button_border = 1,

top_bar = 'no-border',
top_bar_size = 40,
top_bar_size_fullscreen = 46,
top_bar_persistency = '',
Expand All @@ -275,6 +297,7 @@ local options = {
media_types = '3gp,asf,avi,bmp,flac,flv,gif,h264,h265,jpeg,jpg,m4a,m4v,mid,midi,mkv,mov,mp3,mp4,mp4a,mp4v,mpeg,mpg,oga,ogg,ogm,ogv,opus,png,rmvb,svg,tif,tiff,wav,weba,webm,webp,wma,wmv',
subtitle_types = 'aqt,gsub,jss,sub,ttxt,pjs,psb,rt,smi,slt,ssf,srt,ssa,ass,usf,idx,vt',
font_height_to_letter_width_ratio = 0.5,
default_directory = '~/',
chapter_ranges = '^op| op$|opening<968638:0.5>.*, ^ed| ed$|^end|ending$<968638:0.5>.*|{eof}, sponsor start<3535a5:.5>sponsor end, segment start<3535a5:0.5>segment end',
}
opt.read_options(options, 'uosc')
Expand Down Expand Up @@ -1314,6 +1337,23 @@ end
function icons.volume(pos_x, pos_y, size) return icons._volume(false, pos_x, pos_y, size) end
function icons.volume_muted(pos_x, pos_y, size) return icons._volume(true, pos_x, pos_y, size) end

function icons.menu_button(pos_x, pos_y, size)
local ass = assdraw.ass_new()
local scale = size / 100
function x(number) return pos_x + (number * scale) end
function y(number) return pos_y + (number * scale) end
local line_height = 14
local line_spacing = 18
for i = -1, 1 do
local offs = i * (line_height + line_spacing)
ass:move_to(x(-50), y(offs - line_height/2))
ass:line_to(x(50), y(offs - line_height/2))
ass:line_to(x(50), y(offs + line_height/2))
ass:line_to(x(-50), y(offs + line_height/2))
end
return ass.text
end

function icons.arrow_right(pos_x, pos_y, size)
local ass = assdraw.ass_new()
local scale = size / 200
Expand Down Expand Up @@ -1573,8 +1613,10 @@ function render_timeline(this)
ass:draw_stop()
end

for i, chapter in ipairs(state.chapters) do
draw_chapter(chapter.time)
if state.chapters ~= nil then
for i, chapter in ipairs(state.chapters) do
draw_chapter(chapter.time)
end
end

if state.ab_loop_a and state.ab_loop_a > 0 then
Expand Down Expand Up @@ -1962,6 +2004,26 @@ function render_speed(this)
return ass
end

function render_menu_button(this)
local opacity = this:get_effective_proximity()

if this.width == 0 or opacity == 0 then return end

if this.proximity_raw > 0 then opacity = opacity / 2 end

local ass = assdraw.ass_new()
-- Menu button
local burger = elements.menu_button
ass:new_event()
ass:append(icon(
'menu_button',
burger.ax + (burger.width / 2), burger.ay + (burger.height / 2), burger.width, -- x, y, size
0, 0, options.menu_button_border, -- shadow_x, shadow_y, shadow_size
'background', options.menu_button_opacity * opacity -- backdrop, opacity
))
return ass
end

function render_menu(this)
local ass = assdraw.ass_new()

Expand Down Expand Up @@ -2340,6 +2402,16 @@ elements:add('top_bar', Element.new({
if this.forced_proximity then return this.forced_proximity end
return (elements.volume_slider and elements.volume_slider.pressed) and 0 or this.proximity
end,
decide_enabled = function(this)
if options.top_bar == 'no-border' then
this.enabled = not state.border or state.fullormaxed
elseif options.top_bar == 'always' then
this.enabled = true
else
this.enabled = false
end
this.enabled = this.enabled and (options.top_bar_controls or options.top_bar_title)
end,
update_dimensions = function(this)
this.size = state.fullormaxed and options.top_bar_size_fullscreen or options.top_bar_size
this.icon_size = round(this.size / 8)
Expand All @@ -2352,8 +2424,12 @@ elements:add('top_bar', Element.new({
this.title_bx = this.bx - (options.top_bar_controls and (this.button_width * 3) or 0)
this.ax = options.top_bar_title and elements.window_border.size or this.title_bx
end,
on_prop_border = function(this, value)
this.enabled = not value and (options.top_bar_controls or options.top_bar_title)
on_prop_border = function(this)
this:decide_enabled()
this:update_dimensions()
end,
on_prop_fullormaxed = function(this)
this:decide_enabled()
this:update_dimensions()
end,
on_display_change = function(this) this:update_dimensions() end,
Expand Down Expand Up @@ -2480,6 +2556,44 @@ if itable_find({'left', 'right'}, options.volume) then
end,
}))
end
if itable_find({'center', 'bottom-bar'}, options.menu_button) then
elements:add('menu_button', Element.new({
width = 0, height = 0,
get_effective_proximity = function(this)
if menu:is_open() then return 0 end
if is_element_persistent('menu_button') then return 1 end
if elements.timeline.proximity_raw == 0 then return 0 end
if this.forced_proximity then return this.forced_proximity end
if options.menu_button == 'bottom-bar' then
local timeline_proximity = elements.timeline.forced_proximity or elements.timeline.proximity
return this.forced_proximity or math[cursor.hidden and 'min' or 'max'](this.proximity, timeline_proximity)
end
return this.proximity
end,
update_dimensions = function(this)
this.width = state.fullormaxed and options.menu_button_size_fullscreen or options.menu_button_size
this.height = this.width

if options.menu_button == 'bottom-bar' then
this.ax = 15
this.bx = this.ax + this.width
this.by = display.height - 10 - elements.window_border.size - elements.timeline.size_max - elements.timeline.top_border
this.ay = this.by - this.height
else
this.ax = round((display.width - this.width) / 2)
this.ay = round((display.height - this.height) / 2)
this.bx = this.ax + this.width
this.by = this.ay + this.height
end
end,
on_display_change = function(this) this:update_dimensions() end,
on_prop_border = function(this) this:update_dimensions() end,
on_mbtn_left_down = function(this)
if this.proximity_raw == 0 then menu_key_binding() end
end,
render = render_menu_button,
}))
end
if options.speed then
elements:add('speed', Element.new({
dragging = nil,
Expand Down Expand Up @@ -2713,7 +2827,10 @@ state.context_menu_items = (function()
local submenus_by_id = {}

for line in io.lines(input_conf_path) do
local key, command, title = string.match(line, ' *([%S]+) +(.*) #! *(.*)')
local key, command, title = string.match(line, '%s*([%S]+)%s+(.*)%s#!%s*(.*)')
if not key then
key, command, title = string.match(line, '%s*([%S]+)%s+(.*)%s#menu:%s*(.*)')
end
if key then
local is_dummy = key:sub(1, 1) == '#'
local submenu_id = ''
Expand Down Expand Up @@ -2765,6 +2882,12 @@ end

function update_cursor_position()
cursor.x, cursor.y = mp.get_mouse_pos()
-- mpv reports initial mouse position on linux as (0, 0), which always
-- displays the top bar, so we just swap this one coordinate to infinity
if cursor.x == 0 and cursor.y == 0 then
cursor.x = infinity
cursor.y = infinity
end
update_proximities()
request_render()
end
Expand Down Expand Up @@ -3129,6 +3252,9 @@ end)
mp.add_key_binding(nil, 'flash-timeline', function()
elements.timeline:flash()
end)
mp.add_key_binding(nil, 'flash-top-bar', function()
elements.top_bar:flash()
end)
mp.add_key_binding(nil, 'flash-volume', function()
if elements.volume then elements.volume:flash() end
end)
Expand All @@ -3141,29 +3267,31 @@ end)
mp.add_key_binding(nil, 'decide-pause-indicator', function()
elements.pause_indicator:decide()
end)
mp.add_key_binding(nil, 'menu', function()
if menu:is_open('menu') then
menu:close()
elseif state.context_menu_items then
menu:open(state.context_menu_items, function(command)
mp.command(command)
end, {type = 'menu'})
end
end)
function menu_key_binding()
if menu:is_open('menu') then
menu:close()
elseif state.context_menu_items then
menu:open(state.context_menu_items, function(command)
mp.command(command)
end, {type = 'menu'})
end
end
mp.add_key_binding(nil, 'menu', menu_key_binding)
mp.add_key_binding(nil, 'load-subtitles', function()
if menu:is_open('load-subtitles') then menu:close() return end

local path = mp.get_property_native('path')
if path and not is_protocol(path) then
open_file_navigation_menu(
serialize_path(path).dirname,
function(path) mp.commandv('sub-add', path) end,
{
type = 'load-subtitles',
allowed_types = options.subtitle_types
}
)
if path and is_protocol(path) then
path='$HOME'
end
open_file_navigation_menu(
serialize_path(path).dirname,
function(path) mp.commandv('sub-add', path) end,
{
type = 'load-subtitles',
allowed_types = options.subtitle_types
}
)
end)
mp.add_key_binding(nil, 'subtitles', create_select_tracklist_type_menu_opener('Subtitles', 'sub', 'sid'))
mp.add_key_binding(nil, 'audio', create_select_tracklist_type_menu_opener('Audio', 'audio', 'aid'))
Expand Down Expand Up @@ -3332,7 +3460,7 @@ mp.add_key_binding(nil, 'open-file', function()
local active_file

if path == nil or is_protocol(path) then
local path = serialize_path(mp.command_native({'expand-path', '~/'}))
local path = serialize_path(mp.command_native({'expand-path', options.default_directory}))
directory = path.path
active_file = nil
else
Expand Down Expand Up @@ -3398,10 +3526,6 @@ mp.add_key_binding(nil, 'last-file', function() load_file_in_current_directory(-
mp.add_key_binding(nil, 'delete-file-next', function()
local playlist_count = mp.get_property_native('playlist-count')

if playlist_count > 1 then
mp.commandv('playlist-remove', 'current')
end

local next_file = nil

local path = mp.get_property_native('path')
Expand All @@ -3410,17 +3534,23 @@ mp.add_key_binding(nil, 'delete-file-next', function()
if is_local_file then
path = normalize_path(path)

next_file = get_adjacent_file(path, 'forward', options.media_types)

if menu:is_open('open-file') then
elements.menu:delete_value(path)
end
end

if next_file then
mp.commandv('loadfile', next_file)
if playlist_count > 1 then
mp.commandv('playlist-remove', 'current')
else
mp.commandv('stop')
if is_local_file then
next_file = get_adjacent_file(path, 'forward', options.media_types)
end

if next_file then
mp.commandv('loadfile', next_file)
else
mp.commandv('stop')
end
end

if is_local_file then delete_file(path) end
Expand Down

0 comments on commit 9876f9e

Please sign in to comment.