trey/conky
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added left-justifier ('-') as legal format specifier character

Browse Source
This commit is contained in:
Trey Blancher 2020-10-25 22:48:20 -04:00
parent c571a09f4b
commit e7063807dd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts.lua
View File

@ -19,7 +19,7 @@ function split_fmt(f)
in_spec = false in_spec = false
curr = "" curr = ""
elseif string.match(char, '[qs]') then elseif string.match(char, '[qs]') then
if string.match(curr, '^%%[0-9]*$') then if string.match(curr, '^%%%-?[0-9]*$') then
curr = curr .. char curr = curr .. char
table.insert(ret, curr) table.insert(ret, curr)
in_spec = false in_spec = false
@ -28,7 +28,7 @@ function split_fmt(f)
io.stderr:write("Invalid format: '" .. curr .. char .. "'\n") io.stderr:write("Invalid format: '" .. curr .. char .. "'\n")
return nil return nil
end end
elseif string.match(char, '[0-9%.]') then elseif string.match(char, '[0-9%.%-]') then
curr = curr .. char curr = curr .. char
elseif string.match(char, '%%') then elseif string.match(char, '%%') then
if string.match(curr, '^%%') then if string.match(curr, '^%%') then
@ -105,7 +105,7 @@ function conky_printf(format, ...)
end end
for i,fs in ipairs(formats) do for i,fs in ipairs(formats) do
if is_fmt_spec(fs) then -- we have a format specifier if is_fmt_spec(fs) then -- we have a format specifier
if string.match(fs, '[dEefgiouXx]$') then -- we have a numeric format specifier, convert value to number if string.match(fs, '[cdEefgiouXx]$') then -- we have a numeric format specifier, convert value to number
parsed_values[i] = tonumber(trim((parsed_values[i]))) parsed_values[i] = tonumber(trim((parsed_values[i])))
end end
end end