RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-19 06:17:00 +00:00
Code Issues Releases Wiki Activity

console.lua: truncate lines longer than the maximum width

Browse Source 
Avoid messing up the max_log_lines calculation when mp.input.select() is
called with very long items.

This doesn't work with Japanese characters because they are bigger.
This commit is contained in:
Guido Cella 2024-05-10 12:57:05 +02:00 committed by Kacper Michajłow
parent eb4c6be630
commit 9d75289ced
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
player/lua/console.lua
View File

@ -362,7 +362,7 @@ local function fuzzy_find(needle, haystacks)
return result
end
local function populate_log_with_matches()
local function populate_log_with_matches(max_width)
if not selectable_items then
return
end
@ -392,7 +392,7 @@ local function populate_log_with_matches()
for i = first_match_to_print, last_match_to_print do
log[#log + 1] = {
text = matches[i].text .. '\n',
text = truncate_utf8(matches[i].text, max_width) .. '\n',
style = i == selected_match and styles.selected_suggestion or '',
terminal_style = i == selected_match and terminal_styles.selected_suggestion or '',
}
@ -414,7 +414,7 @@ local function print_to_terminal()
return
end
populate_log_with_matches()
populate_log_with_matches(mp.get_property_native('term-size/w', 80))
local log = ''
for _, log_line in ipairs(log_buffers[id]) do
@ -506,7 +506,7 @@ function update()
local suggestions, rows = format_table(suggestion_buffer, width_max, lines_max)
local suggestion_ass = style .. styles.suggestion .. suggestions
populate_log_with_matches()
populate_log_with_matches(width_max)
local log_ass = ''
local log_buffer = log_buffers[id]
@ -633,6 +633,19 @@ function len_utf8(str)
return len
end
function truncate_utf8(str, max_length)
local len = 0
local pos = 1
while pos <= #str do
pos = next_utf8(str, pos)
len = len + 1
if len == max_length - 1 then
return str:sub(1, pos - 1) .. '⋯'
end
end
return str
end
local function handle_edit()
if selectable_items then
matches = {}