Skip to content

Commit

Permalink
feat: window-relative rendering, refactor general structure, types, m…
Browse files Browse the repository at this point in the history 
…any things
  • Loading branch information
@3rd
3rd committed Jun 24, 2023
1 parent 5481ac6 commit 2134ca7
Show file tree
Hide file tree
Showing 10 changed files with 436 additions and 197 deletions.
76 changes: 40 additions & 36 deletions lua/image/backends/ueberzug.lua
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
local utils = require("image/utils")

local child = nil
local should_be_alive = false

local spawn = function()
local stdin = vim.loop.new_pipe()
local stdout = vim.loop.new_pipe()
local stderr = vim.loop.new_pipe()

log("spawn")
should_be_alive = true

local handle, pid = vim.loop.spawn("ueberzug", {
args = { "layer", "--silent" },
stdio = { stdin, stdout, stderr },
}, function(code, signal)
child = nil
print("code", code, "signal", signal)
if should_be_alive then
utils.throw("image: ueberzug died unexpectedly", {
code = code,
signal = signal,
})
end
end)

vim.loop.read_start(stdout, function(err, data)
Expand All @@ -27,16 +34,13 @@ local spawn = function()

local write = function(data)
local serialized = vim.fn.json_encode(data)
-- log("write", serialized)
vim.loop.write(stdin, serialized .. "\n")
end

local shutdown = function()
should_be_alive = false
vim.loop.shutdown(handle, function()
-- log("shutdown")
vim.loop.close(handle, function()
-- log("close")
end)
vim.loop.close(handle, function() end)
end)
end

Expand All @@ -51,35 +55,35 @@ local spawn = function()
}
end

local clear = function(id)
if not child then spawn() end
if id then
---@type Backend
local backend = {
setup = function()
if not child then spawn() end
end,
render = function(image_id, url, x, y, width, height)
child.write({
action = "add",
identifier = image_id,
path = url,
x = x,
y = y,
max_width = width,
max_height = height,
})
end,
clear = function(image_id)
if image_id then
child.write({
action = "remove",
identifier = image_id,
})
return
end
child.write({
action = "remove",
identifier = id,
identifier = "all",
})
return
end
child.write({
action = "remove",
identifier = "all",
})
end

local render = function(id, url, x, y, width, height)
if not child then spawn() end
child.write({
action = "add",
identifier = id,
path = url,
x = x,
y = y,
max_width = width,
max_height = height,
})
end

return {
clear = clear,
render = render,
end,
}

return backend
146 changes: 65 additions & 81 deletions lua/image/init.lua
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
local utils = require("image/utils")

---@type Options
local default_options = {
backend = "ueberzug",
integrations = {
Expand All @@ -13,81 +14,78 @@ local default_options = {
bottom = 1,
left = 0,
},
-- sizing_strategy = "scale",
}

---@type State
local state = {
options = default_options,
integrations = {},
---@diagnostic disable-next-line: assign-type-mismatch
backend = nil,
integrations = {},
options = default_options,
}

---@class markdown_integration_options
---@field enabled boolean
---@class integrations
---@field markdown markdown_integration_options
---@class options
---@field backend "kitty"|"ueberzug"
---@field integrations integrations
---@param image_id string
---@param url string
---@param x number
---@param y number
---@param max_width number
---@param max_height number
local render = function(image_id, url, x, y, max_width, max_height)
if not state.backend then utils.throw("render: could not resolve backend") end
state.backend.render(image_id, url, x, y, max_width, max_height)
end

local get_windows = function()
local windows = {}
for _, window in ipairs(vim.api.nvim_tabpage_list_wins(0)) do
local buffer = vim.api.nvim_win_get_buf(window)
local width = vim.api.nvim_win_get_width(window)
local height = vim.api.nvim_win_get_height(window)
local pos = vim.api.nvim_win_get_position(window)
table.insert(windows, {
winnr = window,
bufnr = buffer,
width = width,
height = height,
x = pos[2],
y = pos[1],
})
---@param win Window
---@param image_id string
---@param url string
---@param x number
---@param y number
---@param max_width number
---@param max_height number
---@return boolean
local render_relative_to_window = function(win, image_id, url, x, y, max_width, max_height)
if not state.backend then utils.throw("render: could not resolve backend") end
if not utils.window.is_window_visible(win) then return false end

local relative_rect = utils.render.relate_rect_to_window(win, x, y, max_width, max_height)

if relative_rect.is_visible then
state.backend.render(
image_id,
url,
relative_rect.x,
relative_rect.y,
relative_rect.max_width,
relative_rect.max_height
)
return true
else
return false
end
return windows
end

local clear = function(id)
if not state.backend then utils.throw("render: could not resolve backend") end
state.backend.clear(id)
end

----------------------------------------------------------------------------------
local rerender_integrations = function()
local backend = state.backend
local windows = get_windows()

-- backend.clear()

local x_offset = state.options.margin.left
if vim.opt.number then
local width = vim.opt.numberwidth:get()
x_offset = x_offset + width
end
if vim.opt.signcolumn ~= "no" then x_offset = x_offset + 2 end
x_offset = x_offset - vim.fn.col("w0")

local y_offset = state.options.margin.top
if vim.opt.showtabline == 2 then y_offset = y_offset + 1 end
y_offset = y_offset - vim.fn.line("w0") + 1

local windows = utils.window.get_visible_windows()
backend.clear()
for _, window in ipairs(windows) do
for _, integration in ipairs(state.integrations) do
if integration.validate(window.bufnr) then
local images = integration.get_buffer_images(window.bufnr)
if integration.validate(window.buf) then
local images = integration.get_buffer_images(window.buf)
for _, image in ipairs(images) do
-- log("render", image)
local id = utils.nanoid()
local width = vim.fn.min({
image.width or 100,
window.width - state.options.margin.left - state.options.margin.right - x_offset,
})
local height = vim.fn.min({ image.height or 100, window.height - state.options.margin.bottom - y_offset })
local x = window.x + image.range.start_col + x_offset
local y = window.y + image.range.start_row + 2 + y_offset
backend.render(id, image.url, x, y, width, height)
local id = utils.random.id()
render_relative_to_window(window, id, image.url, image.range.start_col, image.range.start_row + 1, 100, 100)
end
end
end
end
end

local setup_autocommands = function()
local events = {
"BufEnter",
Expand All @@ -99,7 +97,6 @@ local setup_autocommands = function()
"InsertLeave",
}
local group = vim.api.nvim_create_augroup("render", { clear = true })

vim.api.nvim_create_autocmd(events, {
group = group,
callback = function(args)
Expand All @@ -111,55 +108,42 @@ local setup_autocommands = function()
end,
})
end
----------------------------------------------------------------------------------

---@param options options
---@param options Options
local setup = function(options)
local opts = vim.tbl_deep_extend("force", default_options, options or {})

local ok, backend = pcall(require, "image/backends/" .. opts.backend)
if not ok then
vim.api.nvim_err_writeln("render: failed to load " .. opts.backend .. " backend")
-- load backend
local backend_ok, backend = pcall(require, "image/backends/" .. opts.backend)
if not backend_ok then
utils.throw("render: failed to load " .. opts.backend .. " backend")
return
end
if type(backend.setup) == "function" then backend.setup() end

-- load integrations
local integrations = {}
for name, integration in pairs(opts.integrations) do
if integration.enabled then
---@diagnostic disable-next-line: redefined-local
local ok, integration_module = pcall(require, "image/integrations." .. name)
if ok then
local integration_ok, integration_module = pcall(require, "image/integrations." .. name)
if integration_ok then
table.insert(integrations, integration_module)
else
vim.api.nvim_err_writeln("render: failed to load" .. name .. " integration")
utils.throw("render: failed to load " .. name .. " integration")
end
end
end

-- setup
state = {
options = opts,
integrations = integrations,
backend = backend,
}

setup_autocommands()
end

local render = function(id, url, x, y, width, height)
if not state.backend then
vim.api.nvim_err_writeln("render: could not resolve backend")
return
end
state.backend.render(id, url, x, y, width, height)
end

local clear = function(id)
if not state.backend then
vim.api.nvim_err_writeln("render: could not resolve backend")
return
end
state.backend.clear(id)
end

return {
setup = setup,
render = render,
Expand Down
Loading

0 comments on commit 2134ca7

Please sign in to comment.