awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

naughty: Don't interpret markup in titles 

Since only the body text of a notification may contain markup,
by combining the two together and calling set_markup(), the
title would also get interpreted as if it had markup.
This could be seen with:
$ notify-send "Title & text" "<i>body text</i>"

The unescaped & would get interpreted as broken markup and so
naughty would fall back to escaping everything which would make
the "<i>" tags be shown rather than interpreted.

So, the title must always be escaped so that it is not interpreted
as markup.

Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Ross Lagerwall 2013-03-26 08:16:58 +00:00 committed by Uli Schlachter
parent 8af54130d6
commit fc49e28025
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/naughty.lua.in
View File

@ -303,6 +303,8 @@ function naughty.notify(args)
local margin = args.margin or preset.margin local margin = args.margin or preset.margin
local border_width = args.border_width or preset.border_width local border_width = args.border_width or preset.border_width
local position = args.position or preset.position local position = args.position or preset.position
local escape_pattern = "[<>&]"
local escape_subs = { ['<'] = "&lt;", ['>'] = "&gt;", ['&'] = "&amp;" }
-- beautiful -- beautiful
local beautiful = bt.get() local beautiful = bt.get()
@ -376,17 +378,20 @@ function naughty.notify(args)
textbox:set_font(font) textbox:set_font(font)
local function setMarkup(pattern, replacements) local function setMarkup(pattern, replacements)
textbox:set_markup(string.format('<b>%s</b>%s', title:gsub(pattern, replacements), text:gsub(pattern, replacements))) textbox:set_markup(string.format('<b>%s</b>%s', title, text:gsub(pattern, replacements)))
end end
local function setText() local function setText()
textbox:set_text(string.format('%s %s', title, text)) textbox:set_text(string.format('%s %s', title, text))
end end
-- First try to set the text while only interpreting <br>. -- Since the title cannot contain markup, it must be escaped first so that
-- it is not interpreted by Pango later.
title = title:gsub(escape_pattern, escape_subs)
-- Try to set the text while only interpreting <br>.
-- (Setting a textbox' .text to an invalid pattern throws a lua error) -- (Setting a textbox' .text to an invalid pattern throws a lua error)
if not pcall(setMarkup, "<br.->", "\n") then if not pcall(setMarkup, "<br.->", "\n") then
-- That failed, escape everything which might cause an error from pango -- That failed, escape everything which might cause an error from pango
if not pcall(setMarkup, "[<>&]", { ['<'] = "&lt;", ['>'] = "&gt;", ['&'] = "&amp;" }) then if not pcall(setMarkup, escape_pattern, escape_subs) then
-- Ok, just ignore all pango markup. If this fails, we got some invalid utf8 -- Ok, just ignore all pango markup. If this fails, we got some invalid utf8
if not pcall(setText) then if not pcall(setText) then
textbox:set_markup("<i>&lt;Invalid markup or UTF8, cannot display message&gt;</i>") textbox:set_markup("<i>&lt;Invalid markup or UTF8, cannot display message&gt;</i>")