Actually made it work.. nice.

This commit is contained in:
Thomas Ingham 2022-08-31 14:16:46 -04:00
parent 5e2dd8ee92
commit c61eac8eaf
2 changed files with 20 additions and 25 deletions

View file

@ -47,6 +47,7 @@ require('specs').setup{
- Toggle Specs on/off - Toggle Specs on/off
Faders: Faders:
- sinus_fader `⌣/⌢\⌣/⌢\⌣/⌢\⌣/⌢`
- linear_fader `▁▂▂▃▃▄▄▅▅▆▆▇▇██` - linear_fader `▁▂▂▃▃▄▄▅▅▆▆▇▇██`
- exp_fader `▁▁▁▁▂▂▂▃▃▃▄▄▅▆▇` - exp_fader `▁▁▁▁▂▂▂▃▃▃▄▄▅▆▇`
@ -93,6 +94,9 @@ vim.api.nvim_set_keymap('n', '<C-b>', ':lua require("specs").show_specs()', { no
-- You can even bind it to search jumping and more, example: -- You can even bind it to search jumping and more, example:
vim.api.nvim_set_keymap('n', 'n', 'n:lua require("specs").show_specs()<CR>', { noremap = true, silent = true }) vim.api.nvim_set_keymap('n', 'n', 'n:lua require("specs").show_specs()<CR>', { noremap = true, silent = true })
vim.api.nvim_set_keymap('n', 'N', 'N:lua require("specs").show_specs()<CR>', { noremap = true, silent = true }) vim.api.nvim_set_keymap('n', 'N', 'N:lua require("specs").show_specs()<CR>', { noremap = true, silent = true })
-- Or maybe you do a lot of screen-casts and want to call attention to a specific line of code:
vim.api.nvim_set_keymap('n', '<leader>v', ':lua require("specs").show_specs({width = 97, winhl = "Search", delay_ms = 610, inc_ms = 21})<CR>', { noremap = true, silent = true })
``` ```
## Planned Features ## Planned Features

View file

@ -47,28 +47,11 @@ function M.show_specs(popup)
return return
end end
local function dcopy (t)
local orig_type = type(orig)
local copy
if orig_type == 'table' then
copy = {}
for orig_key, orig_value in next, orig, nil do
copy[deepcopy(orig_key)] = deepcopy(orig_value)
end
setmetatable(copy, deepcopy(getmetatable(orig)))
else -- number, string, boolean, etc
copy = orig
end
return copy
end
if popup == nil then if popup == nil then
popup = opts.popup popup = {}
end end
local originalOptions = deep_copy(opts) local _opts = vim.tbl_deep_extend("force", opts, {popup = popup})
local instanceOptions = deep_copy(opts)
instanceOptions.popup = popup
local cursor_col = vim.fn.wincol()-1 local cursor_col = vim.fn.wincol()-1
local cursor_row = vim.fn.winline()-1 local cursor_row = vim.fn.winline()-1
@ -81,15 +64,15 @@ function M.show_specs(popup)
row = cursor_row, row = cursor_row,
style = 'minimal' style = 'minimal'
}) })
vim.api.nvim_win_set_option(win_id, 'winhl', 'Normal:'.. instanceOptions.popup.winhl) vim.api.nvim_win_set_option(win_id, 'winhl', 'Normal:'.. _opts.popup.winhl)
vim.api.nvim_win_set_option(win_id, "winblend", instanceOptions.popup.blend) vim.api.nvim_win_set_option(win_id, "winblend", _opts.popup.blend)
local cnt = 0 local cnt = 0
local config = vim.api.nvim_win_get_config(win_id) local config = vim.api.nvim_win_get_config(win_id)
local timer = vim.loop.new_timer() local timer = vim.loop.new_timer()
local closed = false local closed = false
vim.loop.timer_start(timer, instanceOptions.popup.delay_ms, instanceOptions.popup.inc_ms, vim.schedule_wrap(function() vim.loop.timer_start(timer, _opts.popup.delay_ms, _opts.popup.inc_ms, vim.schedule_wrap(function()
if closed or vim.api.nvim_get_current_win() ~= start_win_id then if closed or vim.api.nvim_get_current_win() ~= start_win_id then
if not closed then if not closed then
pcall(vim.loop.close, timer) pcall(vim.loop.close, timer)
@ -98,15 +81,14 @@ function M.show_specs(popup)
-- Callbacks might stack up before the timer actually gets closed, track that state -- Callbacks might stack up before the timer actually gets closed, track that state
-- internally here instead -- internally here instead
closed = true closed = true
opts = originalOptions
end end
return return
end end
if vim.api.nvim_win_is_valid(win_id) then if vim.api.nvim_win_is_valid(win_id) then
local bl = instanceOptions.popup.fader(instanceOptions.popup.blend, cnt) local bl = _opts.popup.fader(_opts.popup.blend, cnt)
local dm = instanceOptions.popup.resizer(instanceOptions.popup.width, cursor_col, cnt) local dm = _opts.popup.resizer(_opts.popup.width, cursor_col, cnt)
if bl ~= nil then if bl ~= nil then
vim.api.nvim_win_set_option(win_id, "winblend", bl) vim.api.nvim_win_set_option(win_id, "winblend", bl)
@ -123,6 +105,7 @@ function M.show_specs(popup)
cnt = cnt+1 cnt = cnt+1
end end
end)) end))
end end
--[[ ▁▁▂▂▃▃▄▄▅▅▆▆▇▇██ ]]-- --[[ ▁▁▂▂▃▃▄▄▅▅▆▆▇▇██ ]]--
@ -133,6 +116,14 @@ function M.linear_fader(blend, cnt)
else return nil end else return nil end
end end
--[[ ⌣/⌢\⌣/⌢\⌣/⌢\⌣/⌢\ ]]--
function M.sinus_fader(blend, cnt)
if cnt <= 100 then
return math.ceil((math.sin(cnt * (1 / blend)) * 0.5 + 0.5) * 100)
else return nil end
end
--[[ ▁▁▁▁▂▂▂▃▃▃▄▄▅▆▇ ]]-- --[[ ▁▁▁▁▂▂▂▃▃▃▄▄▅▆▇ ]]--