RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-21 18:57:35 +00:00
Code Issues Releases Wiki Activity

console: refactor text styles for log levels

Browse Source 
The text styles are now in a table.
The color definitions of the theme where the colors were taken from
are now included in a comment for future reference.
The colors have been converted to BGR as is required by ASS.
This commit is contained in:
Christoph Heinrich 2022-06-20 00:08:37 +02:00 committed by Dudemanguy
parent a08b75da2b
commit 898a4cd8a8
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
player/lua/console.lua
View File

@ -55,6 +55,21 @@ end
-- Apply user-set options -- Apply user-set options
options.read_options(opts) options.read_options(opts)
local styles = {
-- Colors are stolen from base16 Eighties by Chris Kempson
-- and converted to BGR as is required by ASS.
-- 2d2d2d 393939 515151 697374
-- 939fa0 c8d0d3 dfe6e8 ecf0f2
-- 7a77f2 5791f9 66ccff 99cc99
-- cccc66 cc9966 cc99cc 537bd2
debug = '{\\1c&Ha09f93&}',
verbose = '{\\1c&H99cc99&}',
warn = '{\\1c&H66ccff&}',
error = '{\\1c&H7a77f2&}',
fatal = '{\\1c&H5791f9&\\b1}',
}
local repl_active = false local repl_active = false
local insert_mode = false local insert_mode = false
local pending_update = false local pending_update = false
@ -329,7 +344,6 @@ function help_command(param)
table.sort(cmdlist, function(c1, c2) table.sort(cmdlist, function(c1, c2)
return c1.name < c2.name return c1.name < c2.name
end) end)
local error_style = '{\\1c&H7a77f2&}'
local output = '' local output = ''
if param == '' then if param == '' then
output = 'Available commands:\n' output = 'Available commands:\n'
@ -350,7 +364,7 @@ function help_command(param)
end end
end end
if not cmd then if not cmd then
log_add(error_style, 'No command matches "' .. param .. '"!') log_add(styles.error, 'No command matches "' .. param .. '"!')
return return
end end
output = output .. 'Command "' .. cmd.name .. '"\n' output = output .. 'Command "' .. cmd.name .. '"\n'
@ -836,19 +850,18 @@ mp.register_event('log-message', function(e)
-- OSD display itself. -- OSD display itself.
if e.level == 'trace' then return end if e.level == 'trace' then return end
-- Use color for debug/v/warn/error/fatal messages. Colors are stolen from -- Use color for debug/v/warn/error/fatal messages.
-- base16 Eighties by Chris Kempson.
local style = '' local style = ''
if e.level == 'debug' then if e.level == 'debug' then
style = '{\\1c&Ha09f93&}' style = styles.debug
elseif e.level == 'v' then elseif e.level == 'v' then
style = '{\\1c&H99cc99&}' style = styles.verbose
elseif e.level == 'warn' then elseif e.level == 'warn' then
style = '{\\1c&H66ccff&}' style = styles.warn
elseif e.level == 'error' then elseif e.level == 'error' then
style = '{\\1c&H7a77f2&}' style = styles.error
elseif e.level == 'fatal' then elseif e.level == 'fatal' then
style = '{\\1c&H5791f9&\\b1}' style = styles.fatal
end end
log_add(style, '[' .. e.prefix .. '] ' .. e.text) log_add(style, '[' .. e.prefix .. '] ' .. e.text)